woothemes /
sensei
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | * |
| 9 | 9 | * @since 1.9.0 |
| 10 | 10 | */ |
| 11 | -class Sensei_Learner{ |
|
| 11 | +class Sensei_Learner { |
|
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * Get the students full name |
@@ -19,25 +19,25 @@ discard block |
||
| 19 | 19 | * @param $user_id |
| 20 | 20 | * @return bool|mixed|void |
| 21 | 21 | */ |
| 22 | - public static function get_full_name( $user_id ){ |
|
| 22 | + public static function get_full_name($user_id) { |
|
| 23 | 23 | |
| 24 | 24 | $full_name = ''; |
| 25 | 25 | |
| 26 | - if( empty( $user_id ) || ! ( 0 < intval( $user_id ) ) |
|
| 27 | - || !( get_userdata( $user_id ) ) ){ |
|
| 26 | + if (empty($user_id) || ! (0 < intval($user_id)) |
|
| 27 | + || ! (get_userdata($user_id))) { |
|
| 28 | 28 | return false; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | // get the user details |
| 32 | - $user = get_user_by( 'id', $user_id ); |
|
| 32 | + $user = get_user_by('id', $user_id); |
|
| 33 | 33 | |
| 34 | - if( ! empty( $user->first_name ) && ! empty( $user->last_name ) ){ |
|
| 34 | + if ( ! empty($user->first_name) && ! empty($user->last_name)) { |
|
| 35 | 35 | |
| 36 | - $full_name = trim( $user->first_name ) . ' ' . trim( $user->last_name ); |
|
| 36 | + $full_name = trim($user->first_name).' '.trim($user->last_name); |
|
| 37 | 37 | |
| 38 | - }else{ |
|
| 38 | + } else { |
|
| 39 | 39 | |
| 40 | - $full_name = $user->display_name; |
|
| 40 | + $full_name = $user->display_name; |
|
| 41 | 41 | |
| 42 | 42 | } |
| 43 | 43 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | * @param $full_name |
| 49 | 49 | * @param $user_id |
| 50 | 50 | */ |
| 51 | - return apply_filters( 'sensei_learner_full_name' , $full_name , $user_id ); |
|
| 51 | + return apply_filters('sensei_learner_full_name', $full_name, $user_id); |
|
| 52 | 52 | |
| 53 | 53 | }// end get_full_name |
| 54 | 54 | |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Sensei Utilities Class |
@@ -18,9 +18,9 @@ discard block |
||
| 18 | 18 | * @since 1.0.0 |
| 19 | 19 | * @return string The URL to the placeholder thumbnail image. |
| 20 | 20 | */ |
| 21 | - public static function get_placeholder_image () { |
|
| 21 | + public static function get_placeholder_image() { |
|
| 22 | 22 | |
| 23 | - return esc_url( apply_filters( 'sensei_placeholder_thumbnail', Sensei()->plugin_url . 'assets/images/placeholder.png' ) ); |
|
| 23 | + return esc_url(apply_filters('sensei_placeholder_thumbnail', Sensei()->plugin_url.'assets/images/placeholder.png')); |
|
| 24 | 24 | } // End get_placeholder_image() |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * @static |
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | - public static function sensei_is_woocommerce_present () { |
|
| 35 | + public static function sensei_is_woocommerce_present() { |
|
| 36 | 36 | |
| 37 | 37 | return Sensei_WC::is_woocommerce_present(); |
| 38 | 38 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @static |
| 48 | 48 | * @return boolean |
| 49 | 49 | */ |
| 50 | - public static function sensei_is_woocommerce_activated () { |
|
| 50 | + public static function sensei_is_woocommerce_activated() { |
|
| 51 | 51 | |
| 52 | 52 | return Sensei_WC::is_woocommerce_active(); |
| 53 | 53 | |
@@ -60,70 +60,70 @@ discard block |
||
| 60 | 60 | * @param array $args (default: array()) |
| 61 | 61 | * @return bool | int |
| 62 | 62 | */ |
| 63 | - public static function sensei_log_activity ( $args = array() ) { |
|
| 63 | + public static function sensei_log_activity($args = array()) { |
|
| 64 | 64 | global $wpdb; |
| 65 | 65 | |
| 66 | 66 | // Args, minimum data required for WP |
| 67 | 67 | $data = array( |
| 68 | - 'comment_post_ID' => intval( $args['post_id'] ), |
|
| 68 | + 'comment_post_ID' => intval($args['post_id']), |
|
| 69 | 69 | 'comment_author' => '', // Not needed |
| 70 | 70 | 'comment_author_email' => '', // Not needed |
| 71 | 71 | 'comment_author_url' => '', // Not needed |
| 72 | - 'comment_content' => !empty($args['data']) ? esc_html( $args['data'] ) : '', |
|
| 73 | - 'comment_type' => esc_attr( $args['type'] ), |
|
| 74 | - 'user_id' => intval( $args['user_id'] ), |
|
| 75 | - 'comment_approved' => !empty($args['status']) ? esc_html( $args['status'] ) : 'log', // 'log' == 'sensei_user_answer' |
|
| 72 | + 'comment_content' => ! empty($args['data']) ? esc_html($args['data']) : '', |
|
| 73 | + 'comment_type' => esc_attr($args['type']), |
|
| 74 | + 'user_id' => intval($args['user_id']), |
|
| 75 | + 'comment_approved' => ! empty($args['status']) ? esc_html($args['status']) : 'log', // 'log' == 'sensei_user_answer' |
|
| 76 | 76 | ); |
| 77 | 77 | // Allow extra data |
| 78 | - if ( !empty($args['username']) ) { |
|
| 79 | - $data['comment_author'] = sanitize_user( $args['username'] ); |
|
| 78 | + if ( ! empty($args['username'])) { |
|
| 79 | + $data['comment_author'] = sanitize_user($args['username']); |
|
| 80 | 80 | } |
| 81 | - if ( !empty($args['user_email']) ) { |
|
| 82 | - $data['comment_author_email'] = sanitize_email( $args['user_email'] ); |
|
| 81 | + if ( ! empty($args['user_email'])) { |
|
| 82 | + $data['comment_author_email'] = sanitize_email($args['user_email']); |
|
| 83 | 83 | } |
| 84 | - if ( !empty($args['user_url']) ) { |
|
| 85 | - $data['comment_author_url'] = esc_url( $args['user_url'] ); |
|
| 84 | + if ( ! empty($args['user_url'])) { |
|
| 85 | + $data['comment_author_url'] = esc_url($args['user_url']); |
|
| 86 | 86 | } |
| 87 | - if ( !empty($args['parent']) ) { |
|
| 87 | + if ( ! empty($args['parent'])) { |
|
| 88 | 88 | $data['comment_parent'] = $args['parent']; |
| 89 | 89 | } |
| 90 | 90 | // Sanity check |
| 91 | - if ( empty($args['user_id']) ) { |
|
| 92 | - _deprecated_argument( __FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei') ); |
|
| 91 | + if (empty($args['user_id'])) { |
|
| 92 | + _deprecated_argument(__FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei')); |
|
| 93 | 93 | return false; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - do_action( 'sensei_log_activity_before', $args, $data ); |
|
| 96 | + do_action('sensei_log_activity_before', $args, $data); |
|
| 97 | 97 | |
| 98 | 98 | $flush_cache = false; |
| 99 | 99 | |
| 100 | 100 | // Custom Logic |
| 101 | 101 | // Check if comment exists first |
| 102 | - $comment_id = $wpdb->get_var( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = %s ", $args['post_id'], $args['user_id'], $args['type'] ) ); |
|
| 103 | - if ( ! $comment_id ) { |
|
| 102 | + $comment_id = $wpdb->get_var($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND user_id = %d AND comment_type = %s ", $args['post_id'], $args['user_id'], $args['type'])); |
|
| 103 | + if ( ! $comment_id) { |
|
| 104 | 104 | // Add the comment |
| 105 | - $comment_id = wp_insert_comment( $data ); |
|
| 105 | + $comment_id = wp_insert_comment($data); |
|
| 106 | 106 | |
| 107 | 107 | $flush_cache = true; |
| 108 | - } elseif ( isset( $args['action'] ) && 'update' == $args['action'] ) { |
|
| 108 | + } elseif (isset($args['action']) && 'update' == $args['action']) { |
|
| 109 | 109 | // Update the comment if an update was requested |
| 110 | 110 | $data['comment_ID'] = $comment_id; |
| 111 | 111 | // By default update the timestamp of the comment |
| 112 | - if ( empty($args['keep_time']) ) { |
|
| 112 | + if (empty($args['keep_time'])) { |
|
| 113 | 113 | $data['comment_date'] = current_time('mysql'); |
| 114 | 114 | } |
| 115 | - wp_update_comment( $data ); |
|
| 115 | + wp_update_comment($data); |
|
| 116 | 116 | $flush_cache = true; |
| 117 | 117 | } // End If Statement |
| 118 | 118 | |
| 119 | 119 | // Manually Flush the Cache |
| 120 | - if ( $flush_cache ) { |
|
| 120 | + if ($flush_cache) { |
|
| 121 | 121 | wp_cache_flush(); |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - do_action( 'sensei_log_activity_after', $args, $data, $comment_id ); |
|
| 124 | + do_action('sensei_log_activity_after', $args, $data, $comment_id); |
|
| 125 | 125 | |
| 126 | - if ( 0 < $comment_id ) { |
|
| 126 | + if (0 < $comment_id) { |
|
| 127 | 127 | // Return the ID so that it can be used for meta data storage |
| 128 | 128 | return $comment_id; |
| 129 | 129 | } else { |
@@ -140,41 +140,41 @@ discard block |
||
| 140 | 140 | * @param bool $return_comments (default: false) |
| 141 | 141 | * @return mixed | int |
| 142 | 142 | */ |
| 143 | - public static function sensei_check_for_activity ( $args = array(), $return_comments = false ) { |
|
| 143 | + public static function sensei_check_for_activity($args = array(), $return_comments = false) { |
|
| 144 | 144 | |
| 145 | 145 | global $wp_version; |
| 146 | - if ( !$return_comments ) { |
|
| 146 | + if ( ! $return_comments) { |
|
| 147 | 147 | $args['count'] = true; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | // Are we only retrieving a single entry, or not care about the order... |
| 151 | - if ( isset( $args['count'] ) || isset( $args['post_id'] ) ){ |
|
| 151 | + if (isset($args['count']) || isset($args['post_id'])) { |
|
| 152 | 152 | |
| 153 | 153 | // ...then we don't need to ask the db to order the results, this overrides WP default behaviour |
| 154 | - if ( version_compare( $wp_version, '4.1', '>=' ) ) { |
|
| 154 | + if (version_compare($wp_version, '4.1', '>=')) { |
|
| 155 | 155 | $args['order'] = false; |
| 156 | 156 | $args['orderby'] = false; |
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | // A user ID of 0 is in valid, so shortcut this |
| 161 | - if ( isset( $args['user_id'] ) && 0 == intval ( $args['user_id'] ) ) { |
|
| 162 | - _deprecated_argument( __FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei') ); |
|
| 161 | + if (isset($args['user_id']) && 0 == intval($args['user_id'])) { |
|
| 162 | + _deprecated_argument(__FUNCTION__, '1.0', __('At no point should user_id be equal to 0.', 'woothemes-sensei')); |
|
| 163 | 163 | return false; |
| 164 | 164 | } |
| 165 | 165 | // Check for legacy code |
| 166 | - if ( isset($args['type']) && in_array($args['type'], array('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_quiz_grade', 'sense_answer_notes') ) ) { |
|
| 167 | - _deprecated_argument( __FUNCTION__, '1.7', sprintf( __('Sensei activity type %s is no longer used.', 'woothemes-sensei'), $args['type'] ) ); |
|
| 166 | + if (isset($args['type']) && in_array($args['type'], array('sensei_course_start', 'sensei_course_end', 'sensei_lesson_start', 'sensei_lesson_end', 'sensei_quiz_asked', 'sensei_user_grade', 'sensei_quiz_grade', 'sense_answer_notes'))) { |
|
| 167 | + _deprecated_argument(__FUNCTION__, '1.7', sprintf(__('Sensei activity type %s is no longer used.', 'woothemes-sensei'), $args['type'])); |
|
| 168 | 168 | return false; |
| 169 | 169 | } |
| 170 | 170 | // Are we checking for specific comment_approved statuses? |
| 171 | - if ( isset($args['status']) ) { |
|
| 171 | + if (isset($args['status'])) { |
|
| 172 | 172 | // Temporarily store as a custom status if requesting an array... |
| 173 | - if ( is_array( $args['status'] ) && version_compare($wp_version, '4.1', '<') ) { |
|
| 173 | + if (is_array($args['status']) && version_compare($wp_version, '4.1', '<')) { |
|
| 174 | 174 | // Encode now, decode later |
| 175 | - $args['status'] = implode( ",", $args['status'] ); |
|
| 175 | + $args['status'] = implode(",", $args['status']); |
|
| 176 | 176 | // ...use a filter to switch the encoding back |
| 177 | - add_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) ); |
|
| 177 | + add_filter('comments_clauses', array(__CLASS__, 'comment_multiple_status_filter')); |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | else { |
@@ -182,8 +182,8 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | // Take into account WP < 4.1 will automatically add ' comment_approved = 1 OR comment_approved = 0 ' |
| 185 | - if ( ( is_array( $args['status'] ) || 'any' == $args['status'] ) && version_compare($wp_version, '4.1', '<') ) { |
|
| 186 | - add_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) ); |
|
| 185 | + if ((is_array($args['status']) || 'any' == $args['status']) && version_compare($wp_version, '4.1', '<')) { |
|
| 186 | + add_filter('comments_clauses', array(__CLASS__, 'comment_any_status_filter')); |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | //Get the comments |
@@ -194,14 +194,14 @@ discard block |
||
| 194 | 194 | * |
| 195 | 195 | * @param int|array $comments |
| 196 | 196 | */ |
| 197 | - $comments = apply_filters('sensei_check_for_activity', get_comments( $args ) ); |
|
| 197 | + $comments = apply_filters('sensei_check_for_activity', get_comments($args)); |
|
| 198 | 198 | |
| 199 | - remove_filter( 'comments_clauses', array( __CLASS__, 'comment_multiple_status_filter' ) ); |
|
| 200 | - remove_filter( 'comments_clauses', array( __CLASS__, 'comment_any_status_filter' ) ); |
|
| 199 | + remove_filter('comments_clauses', array(__CLASS__, 'comment_multiple_status_filter')); |
|
| 200 | + remove_filter('comments_clauses', array(__CLASS__, 'comment_any_status_filter')); |
|
| 201 | 201 | // Return comments |
| 202 | - if ( $return_comments ) { |
|
| 202 | + if ($return_comments) { |
|
| 203 | 203 | // Could check for array of 1 and just return the 1 item? |
| 204 | - if ( is_array($comments) && 1 == count($comments) ) { |
|
| 204 | + if (is_array($comments) && 1 == count($comments)) { |
|
| 205 | 205 | $comments = array_shift($comments); |
| 206 | 206 | } |
| 207 | 207 | |
@@ -219,31 +219,31 @@ discard block |
||
| 219 | 219 | * @param array $args (default: array()) |
| 220 | 220 | * @return array |
| 221 | 221 | */ |
| 222 | - public static function sensei_activity_ids ( $args = array() ) { |
|
| 222 | + public static function sensei_activity_ids($args = array()) { |
|
| 223 | 223 | |
| 224 | 224 | |
| 225 | - $comments = Sensei_Utils::sensei_check_for_activity( $args, true ); |
|
| 225 | + $comments = Sensei_Utils::sensei_check_for_activity($args, true); |
|
| 226 | 226 | // Need to always use an array, even with only 1 item |
| 227 | - if ( !is_array($comments) ) { |
|
| 228 | - $comments = array( $comments ); |
|
| 227 | + if ( ! is_array($comments)) { |
|
| 228 | + $comments = array($comments); |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | $post_ids = array(); |
| 232 | 232 | // Count comments |
| 233 | - if ( is_array( $comments ) && ( 0 < intval( count( $comments ) ) ) ) { |
|
| 234 | - foreach ( $comments as $key => $value ) { |
|
| 233 | + if (is_array($comments) && (0 < intval(count($comments)))) { |
|
| 234 | + foreach ($comments as $key => $value) { |
|
| 235 | 235 | // Add matches to id array |
| 236 | - if ( isset( $args['field'] ) && 'comment' == $args['field'] ) { |
|
| 237 | - array_push( $post_ids, $value->comment_ID ); |
|
| 238 | - } elseif( isset( $args['field'] ) && 'user_id' == $args['field'] ) { |
|
| 239 | - array_push( $post_ids, $value->user_id ); |
|
| 236 | + if (isset($args['field']) && 'comment' == $args['field']) { |
|
| 237 | + array_push($post_ids, $value->comment_ID); |
|
| 238 | + } elseif (isset($args['field']) && 'user_id' == $args['field']) { |
|
| 239 | + array_push($post_ids, $value->user_id); |
|
| 240 | 240 | } else { |
| 241 | - array_push( $post_ids, $value->comment_post_ID ); |
|
| 241 | + array_push($post_ids, $value->comment_post_ID); |
|
| 242 | 242 | } // End If Statement |
| 243 | 243 | } // End For Loop |
| 244 | 244 | // Reset array indexes |
| 245 | - $post_ids = array_unique( $post_ids ); |
|
| 246 | - $post_ids = array_values( $post_ids ); |
|
| 245 | + $post_ids = array_unique($post_ids); |
|
| 246 | + $post_ids = array_values($post_ids); |
|
| 247 | 247 | } // End If Statement |
| 248 | 248 | |
| 249 | 249 | return $post_ids; |
@@ -257,20 +257,20 @@ discard block |
||
| 257 | 257 | * @param array $args (default: array()) |
| 258 | 258 | * @return boolean |
| 259 | 259 | */ |
| 260 | - public static function sensei_delete_activities ( $args = array() ) { |
|
| 260 | + public static function sensei_delete_activities($args = array()) { |
|
| 261 | 261 | |
| 262 | 262 | $dataset_changes = false; |
| 263 | 263 | |
| 264 | 264 | // If activity exists remove activity from log |
| 265 | - $comments = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => intval( $args['post_id'] ), 'user_id' => intval( $args['user_id'] ), 'type' => esc_attr( $args['type'] ) ), true ); |
|
| 266 | - if( $comments ) { |
|
| 265 | + $comments = Sensei_Utils::sensei_check_for_activity(array('post_id' => intval($args['post_id']), 'user_id' => intval($args['user_id']), 'type' => esc_attr($args['type'])), true); |
|
| 266 | + if ($comments) { |
|
| 267 | 267 | // Need to always return an array, even with only 1 item |
| 268 | - if ( !is_array( $comments ) ) { |
|
| 269 | - $comments = array( $comments ); |
|
| 268 | + if ( ! is_array($comments)) { |
|
| 269 | + $comments = array($comments); |
|
| 270 | 270 | } |
| 271 | - foreach ( $comments as $key => $value ) { |
|
| 272 | - if ( isset( $value->comment_ID ) && 0 < $value->comment_ID ) { |
|
| 273 | - $dataset_changes = wp_delete_comment( intval( $value->comment_ID ), true ); |
|
| 271 | + foreach ($comments as $key => $value) { |
|
| 272 | + if (isset($value->comment_ID) && 0 < $value->comment_ID) { |
|
| 273 | + $dataset_changes = wp_delete_comment(intval($value->comment_ID), true); |
|
| 274 | 274 | } // End If Statement |
| 275 | 275 | } // End For Loop |
| 276 | 276 | // Manually flush the cache |
@@ -286,25 +286,25 @@ discard block |
||
| 286 | 286 | * @param integer $user_id User ID |
| 287 | 287 | * @return boolean |
| 288 | 288 | */ |
| 289 | - public static function delete_all_user_activity( $user_id = 0 ) { |
|
| 289 | + public static function delete_all_user_activity($user_id = 0) { |
|
| 290 | 290 | |
| 291 | 291 | $dataset_changes = false; |
| 292 | 292 | |
| 293 | - if( $user_id ) { |
|
| 293 | + if ($user_id) { |
|
| 294 | 294 | |
| 295 | - $activities = Sensei_Utils::sensei_check_for_activity( array( 'user_id' => $user_id ), true ); |
|
| 295 | + $activities = Sensei_Utils::sensei_check_for_activity(array('user_id' => $user_id), true); |
|
| 296 | 296 | |
| 297 | - if( $activities ) { |
|
| 297 | + if ($activities) { |
|
| 298 | 298 | |
| 299 | 299 | // Need to always return an array, even with only 1 item |
| 300 | - if ( ! is_array( $activities ) ) { |
|
| 301 | - $activities = array( $activities ); |
|
| 300 | + if ( ! is_array($activities)) { |
|
| 301 | + $activities = array($activities); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | - foreach( $activities as $activity ) { |
|
| 305 | - if( '' == $activity->comment_type ) continue; |
|
| 306 | - if( strpos( 'sensei_', $activity->comment_type ) != 0 ) continue; |
|
| 307 | - $dataset_changes = wp_delete_comment( intval( $activity->comment_ID ), true ); |
|
| 304 | + foreach ($activities as $activity) { |
|
| 305 | + if ('' == $activity->comment_type) continue; |
|
| 306 | + if (strpos('sensei_', $activity->comment_type) != 0) continue; |
|
| 307 | + $dataset_changes = wp_delete_comment(intval($activity->comment_ID), true); |
|
| 308 | 308 | wp_cache_flush(); |
| 309 | 309 | } |
| 310 | 310 | } |
@@ -321,14 +321,14 @@ discard block |
||
| 321 | 321 | * @param array $args (default: array()) |
| 322 | 322 | * @return string |
| 323 | 323 | */ |
| 324 | - public static function sensei_get_activity_value ( $args = array() ) { |
|
| 324 | + public static function sensei_get_activity_value($args = array()) { |
|
| 325 | 325 | |
| 326 | 326 | |
| 327 | 327 | $activity_value = false; |
| 328 | - if ( !empty($args['field']) ) { |
|
| 329 | - $comment = Sensei_Utils::sensei_check_for_activity( $args, true ); |
|
| 328 | + if ( ! empty($args['field'])) { |
|
| 329 | + $comment = Sensei_Utils::sensei_check_for_activity($args, true); |
|
| 330 | 330 | |
| 331 | - if ( isset( $comment->{$args['field']} ) && '' != $comment->{$args['field']} ) { |
|
| 331 | + if (isset($comment->{$args['field']} ) && '' != $comment->{$args['field']} ) { |
|
| 332 | 332 | $activity_value = $comment->{$args['field']}; |
| 333 | 333 | } // End If Statement |
| 334 | 334 | } |
@@ -346,22 +346,22 @@ discard block |
||
| 346 | 346 | * @param int $product_id |
| 347 | 347 | * @return bool |
| 348 | 348 | */ |
| 349 | - public static function sensei_customer_bought_product ( $customer_email, $user_id, $product_id ) { |
|
| 349 | + public static function sensei_customer_bought_product($customer_email, $user_id, $product_id) { |
|
| 350 | 350 | |
| 351 | 351 | $emails = array(); |
| 352 | 352 | |
| 353 | - if ( $user_id ) { |
|
| 354 | - $user = get_user_by( 'id', intval( $user_id ) ); |
|
| 353 | + if ($user_id) { |
|
| 354 | + $user = get_user_by('id', intval($user_id)); |
|
| 355 | 355 | $emails[] = $user->user_email; |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | - if ( is_email( $customer_email ) ) |
|
| 358 | + if (is_email($customer_email)) |
|
| 359 | 359 | $emails[] = $customer_email; |
| 360 | 360 | |
| 361 | - if ( sizeof( $emails ) == 0 ) |
|
| 361 | + if (sizeof($emails) == 0) |
|
| 362 | 362 | return false; |
| 363 | 363 | |
| 364 | - return Sensei_WC::has_customer_bought_product( $user_id, $product_id ); |
|
| 364 | + return Sensei_WC::has_customer_bought_product($user_id, $product_id); |
|
| 365 | 365 | |
| 366 | 366 | } // End sensei_customer_bought_product() |
| 367 | 367 | |
@@ -372,9 +372,9 @@ discard block |
||
| 372 | 372 | * @param string $input_name Name for text area form element |
| 373 | 373 | * @return void |
| 374 | 374 | */ |
| 375 | - public static function sensei_text_editor( $content = '', $editor_id = 'senseitexteditor', $input_name = '' ) { |
|
| 375 | + public static function sensei_text_editor($content = '', $editor_id = 'senseitexteditor', $input_name = '') { |
|
| 376 | 376 | |
| 377 | - if( ! $input_name ) $input_name = $editor_id; |
|
| 377 | + if ( ! $input_name) $input_name = $editor_id; |
|
| 378 | 378 | |
| 379 | 379 | $buttons = 'bold,italic,underline,strikethrough,blockquote,bullist,numlist,justifyleft,justifycenter,justifyright,undo,redo,pastetext'; |
| 380 | 380 | |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | 'quicktags' => false |
| 393 | 393 | ); |
| 394 | 394 | |
| 395 | - wp_editor( $content, $editor_id, $settings ); |
|
| 395 | + wp_editor($content, $editor_id, $settings); |
|
| 396 | 396 | |
| 397 | 397 | } // End sensei_text_editor() |
| 398 | 398 | |
@@ -402,57 +402,57 @@ discard block |
||
| 402 | 402 | * @param int $user_id |
| 403 | 403 | * @return boolean Whether the answers were saved or not |
| 404 | 404 | */ |
| 405 | - public static function sensei_save_quiz_answers( $submitted = array(), $user_id = 0 ) { |
|
| 405 | + public static function sensei_save_quiz_answers($submitted = array(), $user_id = 0) { |
|
| 406 | 406 | |
| 407 | - if( intval( $user_id ) == 0 ) { |
|
| 407 | + if (intval($user_id) == 0) { |
|
| 408 | 408 | $user_id = get_current_user_id(); |
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | $answers_saved = false; |
| 412 | 412 | |
| 413 | - if( $submitted && intval( $user_id ) > 0 ) { |
|
| 413 | + if ($submitted && intval($user_id) > 0) { |
|
| 414 | 414 | |
| 415 | - foreach( $submitted as $question_id => $answer ) { |
|
| 415 | + foreach ($submitted as $question_id => $answer) { |
|
| 416 | 416 | |
| 417 | 417 | // Get question type |
| 418 | - $question_type = Sensei()->question->get_question_type( $question_id ); |
|
| 418 | + $question_type = Sensei()->question->get_question_type($question_id); |
|
| 419 | 419 | |
| 420 | 420 | // Sanitise answer |
| 421 | - if( 0 == get_magic_quotes_gpc() ) { |
|
| 422 | - $answer = wp_unslash( $answer ); |
|
| 421 | + if (0 == get_magic_quotes_gpc()) { |
|
| 422 | + $answer = wp_unslash($answer); |
|
| 423 | 423 | } |
| 424 | - switch( $question_type ) { |
|
| 425 | - case 'multi-line': $answer = nl2br( $answer ); break; |
|
| 424 | + switch ($question_type) { |
|
| 425 | + case 'multi-line': $answer = nl2br($answer); break; |
|
| 426 | 426 | case 'single-line': break; |
| 427 | 427 | case 'gap-fill': break; |
| 428 | - default: $answer = maybe_serialize( $answer ); break; |
|
| 428 | + default: $answer = maybe_serialize($answer); break; |
|
| 429 | 429 | } |
| 430 | 430 | $args = array( |
| 431 | 431 | 'post_id' => $question_id, |
| 432 | - 'data' => base64_encode( $answer ), |
|
| 432 | + 'data' => base64_encode($answer), |
|
| 433 | 433 | 'type' => 'sensei_user_answer', /* FIELD SIZE 20 */ |
| 434 | 434 | 'user_id' => $user_id, |
| 435 | 435 | 'action' => 'update' |
| 436 | 436 | ); |
| 437 | - $answers_saved = Sensei_Utils::sensei_log_activity( $args ); |
|
| 437 | + $answers_saved = Sensei_Utils::sensei_log_activity($args); |
|
| 438 | 438 | } |
| 439 | 439 | |
| 440 | 440 | // Handle file upload questions |
| 441 | - if( isset( $_FILES ) ) { |
|
| 442 | - foreach( $_FILES as $field => $file ) { |
|
| 443 | - if( strpos( $field, 'file_upload_' ) !== false ) { |
|
| 444 | - $question_id = str_replace( 'file_upload_', '', $field ); |
|
| 445 | - if( $file && $question_id ) { |
|
| 446 | - $attachment_id = self::upload_file( $file ); |
|
| 447 | - if( $attachment_id ) { |
|
| 441 | + if (isset($_FILES)) { |
|
| 442 | + foreach ($_FILES as $field => $file) { |
|
| 443 | + if (strpos($field, 'file_upload_') !== false) { |
|
| 444 | + $question_id = str_replace('file_upload_', '', $field); |
|
| 445 | + if ($file && $question_id) { |
|
| 446 | + $attachment_id = self::upload_file($file); |
|
| 447 | + if ($attachment_id) { |
|
| 448 | 448 | $args = array( |
| 449 | 449 | 'post_id' => $question_id, |
| 450 | - 'data' => base64_encode( $attachment_id ), |
|
| 450 | + 'data' => base64_encode($attachment_id), |
|
| 451 | 451 | 'type' => 'sensei_user_answer', /* FIELD SIZE 20 */ |
| 452 | 452 | 'user_id' => $user_id, |
| 453 | 453 | 'action' => 'update' |
| 454 | 454 | ); |
| 455 | - $answers_saved = Sensei_Utils::sensei_log_activity( $args ); |
|
| 455 | + $answers_saved = Sensei_Utils::sensei_log_activity($args); |
|
| 456 | 456 | } |
| 457 | 457 | } |
| 458 | 458 | } |
@@ -464,9 +464,9 @@ discard block |
||
| 464 | 464 | |
| 465 | 465 | } // End sensei_save_quiz_answers() |
| 466 | 466 | |
| 467 | - public static function upload_file( $file = array() ) { |
|
| 467 | + public static function upload_file($file = array()) { |
|
| 468 | 468 | |
| 469 | - require_once( ABSPATH . 'wp-admin/includes/admin.php' ); |
|
| 469 | + require_once(ABSPATH.'wp-admin/includes/admin.php'); |
|
| 470 | 470 | |
| 471 | 471 | /** |
| 472 | 472 | * Filter the data array for the Sensei wp_handle_upload function call |
@@ -481,11 +481,11 @@ discard block |
||
| 481 | 481 | * @type string test_form set to false by default |
| 482 | 482 | * } |
| 483 | 483 | */ |
| 484 | - $file_upload_args = apply_filters( 'sensei_file_upload_args', array('test_form' => false ) ); |
|
| 484 | + $file_upload_args = apply_filters('sensei_file_upload_args', array('test_form' => false)); |
|
| 485 | 485 | |
| 486 | - $file_return = wp_handle_upload( $file, $file_upload_args ); |
|
| 486 | + $file_return = wp_handle_upload($file, $file_upload_args); |
|
| 487 | 487 | |
| 488 | - if( isset( $file_return['error'] ) || isset( $file_return['upload_error_handler'] ) ) { |
|
| 488 | + if (isset($file_return['error']) || isset($file_return['upload_error_handler'])) { |
|
| 489 | 489 | return false; |
| 490 | 490 | } else { |
| 491 | 491 | |
@@ -493,19 +493,19 @@ discard block |
||
| 493 | 493 | |
| 494 | 494 | $attachment = array( |
| 495 | 495 | 'post_mime_type' => $file_return['type'], |
| 496 | - 'post_title' => preg_replace( '/\.[^.]+$/', '', basename( $filename ) ), |
|
| 496 | + 'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)), |
|
| 497 | 497 | 'post_content' => '', |
| 498 | 498 | 'post_status' => 'inherit', |
| 499 | 499 | 'guid' => $file_return['url'] |
| 500 | 500 | ); |
| 501 | 501 | |
| 502 | - $attachment_id = wp_insert_attachment( $attachment, $filename ); |
|
| 502 | + $attachment_id = wp_insert_attachment($attachment, $filename); |
|
| 503 | 503 | |
| 504 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 505 | - $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename ); |
|
| 506 | - wp_update_attachment_metadata( $attachment_id, $attachment_data ); |
|
| 504 | + require_once(ABSPATH.'wp-admin/includes/image.php'); |
|
| 505 | + $attachment_data = wp_generate_attachment_metadata($attachment_id, $filename); |
|
| 506 | + wp_update_attachment_metadata($attachment_id, $attachment_data); |
|
| 507 | 507 | |
| 508 | - if( 0 < intval( $attachment_id ) ) { |
|
| 508 | + if (0 < intval($attachment_id)) { |
|
| 509 | 509 | return $attachment_id; |
| 510 | 510 | } |
| 511 | 511 | } |
@@ -531,9 +531,9 @@ discard block |
||
| 531 | 531 | * |
| 532 | 532 | * @return int $quiz_grade total sum of all question grades |
| 533 | 533 | */ |
| 534 | - public static function sensei_grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) { |
|
| 534 | + public static function sensei_grade_quiz_auto($quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto') { |
|
| 535 | 535 | |
| 536 | - return Sensei_Grading::grade_quiz_auto( $quiz_id, $submitted, $total_questions, $quiz_grade_type ); |
|
| 536 | + return Sensei_Grading::grade_quiz_auto($quiz_id, $submitted, $total_questions, $quiz_grade_type); |
|
| 537 | 537 | |
| 538 | 538 | } // End sensei_grade_quiz_auto() |
| 539 | 539 | |
@@ -545,20 +545,20 @@ discard block |
||
| 545 | 545 | * @param string $quiz_grade_type default 'auto' |
| 546 | 546 | * @return boolean |
| 547 | 547 | */ |
| 548 | - public static function sensei_grade_quiz( $quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto' ) { |
|
| 549 | - if( intval( $user_id ) == 0 ) { |
|
| 548 | + public static function sensei_grade_quiz($quiz_id = 0, $grade = 0, $user_id = 0, $quiz_grade_type = 'auto') { |
|
| 549 | + if (intval($user_id) == 0) { |
|
| 550 | 550 | $user_id = get_current_user_id(); |
| 551 | 551 | } |
| 552 | 552 | |
| 553 | 553 | $activity_logged = false; |
| 554 | - if( intval( $quiz_id ) > 0 && intval( $user_id ) > 0 ) { |
|
| 555 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); |
|
| 556 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); |
|
| 557 | - $activity_logged = update_comment_meta( $user_lesson_status->comment_ID, 'grade', $grade ); |
|
| 554 | + if (intval($quiz_id) > 0 && intval($user_id) > 0) { |
|
| 555 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); |
|
| 556 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); |
|
| 557 | + $activity_logged = update_comment_meta($user_lesson_status->comment_ID, 'grade', $grade); |
|
| 558 | 558 | |
| 559 | - $quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) ); |
|
| 559 | + $quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true)); |
|
| 560 | 560 | |
| 561 | - do_action( 'sensei_user_quiz_grade', $user_id, $quiz_id, $grade, $quiz_passmark, $quiz_grade_type ); |
|
| 561 | + do_action('sensei_user_quiz_grade', $user_id, $quiz_id, $grade, $quiz_passmark, $quiz_grade_type); |
|
| 562 | 562 | } |
| 563 | 563 | |
| 564 | 564 | return $activity_logged; |
@@ -578,9 +578,9 @@ discard block |
||
| 578 | 578 | * |
| 579 | 579 | * @return int $question_grade |
| 580 | 580 | */ |
| 581 | - public static function sensei_grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) { |
|
| 581 | + public static function sensei_grade_question_auto($question_id = 0, $question_type = '', $answer = '', $user_id = 0) { |
|
| 582 | 582 | |
| 583 | - return WooThemes_Sensei_Grading::grade_question_auto( $question_id, $question_type, $answer, $user_id ); |
|
| 583 | + return WooThemes_Sensei_Grading::grade_question_auto($question_id, $question_type, $answer, $user_id); |
|
| 584 | 584 | |
| 585 | 585 | } // end sensei_grade_question_auto |
| 586 | 586 | |
@@ -591,20 +591,20 @@ discard block |
||
| 591 | 591 | * @param int $user_id |
| 592 | 592 | * @return boolean |
| 593 | 593 | */ |
| 594 | - public static function sensei_grade_question( $question_id = 0, $grade = 0, $user_id = 0 ) { |
|
| 595 | - if( intval( $user_id ) == 0 ) { |
|
| 594 | + public static function sensei_grade_question($question_id = 0, $grade = 0, $user_id = 0) { |
|
| 595 | + if (intval($user_id) == 0) { |
|
| 596 | 596 | $user_id = get_current_user_id(); |
| 597 | 597 | } |
| 598 | 598 | |
| 599 | 599 | $activity_logged = false; |
| 600 | - if( intval( $question_id ) > 0 && intval( $user_id ) > 0 ) { |
|
| 600 | + if (intval($question_id) > 0 && intval($user_id) > 0) { |
|
| 601 | 601 | |
| 602 | - $user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); |
|
| 603 | - $activity_logged = update_comment_meta( $user_answer_id, 'user_grade', $grade ); |
|
| 602 | + $user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); |
|
| 603 | + $activity_logged = update_comment_meta($user_answer_id, 'user_grade', $grade); |
|
| 604 | 604 | |
| 605 | - $answer_notes = get_post_meta( $question_id, '_answer_feedback', true ); |
|
| 606 | - if ( !empty($answer_notes) ) { |
|
| 607 | - update_comment_meta( $user_answer_id, 'answer_note', base64_encode( $answer_notes ) ); |
|
| 605 | + $answer_notes = get_post_meta($question_id, '_answer_feedback', true); |
|
| 606 | + if ( ! empty($answer_notes)) { |
|
| 607 | + update_comment_meta($user_answer_id, 'answer_note', base64_encode($answer_notes)); |
|
| 608 | 608 | } |
| 609 | 609 | |
| 610 | 610 | } |
@@ -612,15 +612,15 @@ discard block |
||
| 612 | 612 | return $activity_logged; |
| 613 | 613 | } |
| 614 | 614 | |
| 615 | - public static function sensei_delete_question_grade( $question_id = 0, $user_id = 0 ) { |
|
| 616 | - if( intval( $user_id ) == 0 ) { |
|
| 615 | + public static function sensei_delete_question_grade($question_id = 0, $user_id = 0) { |
|
| 616 | + if (intval($user_id) == 0) { |
|
| 617 | 617 | $user_id = get_current_user_id(); |
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | $activity_logged = false; |
| 621 | - if( intval( $question_id ) > 0 ) { |
|
| 622 | - $user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); |
|
| 623 | - $activity_logged = delete_comment_meta( $user_answer_id, 'user_grade' ); |
|
| 621 | + if (intval($question_id) > 0) { |
|
| 622 | + $user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); |
|
| 623 | + $activity_logged = delete_comment_meta($user_answer_id, 'user_grade'); |
|
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | return $activity_logged; |
@@ -638,9 +638,9 @@ discard block |
||
| 638 | 638 | * |
| 639 | 639 | * @return mixed boolean or comment_ID |
| 640 | 640 | */ |
| 641 | - public static function user_start_lesson( $user_id = 0, $lesson_id = 0, $complete = false ) { |
|
| 641 | + public static function user_start_lesson($user_id = 0, $lesson_id = 0, $complete = false) { |
|
| 642 | 642 | |
| 643 | - return self::sensei_start_lesson( $lesson_id, $user_id, $complete ); |
|
| 643 | + return self::sensei_start_lesson($lesson_id, $user_id, $complete); |
|
| 644 | 644 | |
| 645 | 645 | }// end user_start_lesson() |
| 646 | 646 | |
@@ -657,22 +657,22 @@ discard block |
||
| 657 | 657 | * |
| 658 | 658 | * @return mixed boolean or comment_ID |
| 659 | 659 | */ |
| 660 | - public static function sensei_start_lesson( $lesson_id = 0, $user_id = 0, $complete = false ) { |
|
| 660 | + public static function sensei_start_lesson($lesson_id = 0, $user_id = 0, $complete = false) { |
|
| 661 | 661 | |
| 662 | 662 | |
| 663 | - if( intval( $user_id ) == 0 ) { |
|
| 663 | + if (intval($user_id) == 0) { |
|
| 664 | 664 | $user_id = get_current_user_id(); |
| 665 | 665 | } |
| 666 | 666 | |
| 667 | 667 | $activity_logged = false; |
| 668 | 668 | |
| 669 | - if( intval( $lesson_id ) > 0 ) { |
|
| 669 | + if (intval($lesson_id) > 0) { |
|
| 670 | 670 | |
| 671 | - $course_id = get_post_meta( $lesson_id, '_lesson_course', true ); |
|
| 672 | - if( $course_id ) { |
|
| 673 | - $is_user_taking_course = Sensei_Utils::user_started_course( $course_id, $user_id ); |
|
| 674 | - if( ! $is_user_taking_course ) { |
|
| 675 | - Sensei_Utils::user_start_course( $user_id, $course_id ); |
|
| 671 | + $course_id = get_post_meta($lesson_id, '_lesson_course', true); |
|
| 672 | + if ($course_id) { |
|
| 673 | + $is_user_taking_course = Sensei_Utils::user_started_course($course_id, $user_id); |
|
| 674 | + if ( ! $is_user_taking_course) { |
|
| 675 | + Sensei_Utils::user_start_course($user_id, $course_id); |
|
| 676 | 676 | } |
| 677 | 677 | } |
| 678 | 678 | |
@@ -680,12 +680,12 @@ discard block |
||
| 680 | 680 | $status = 'in-progress'; |
| 681 | 681 | |
| 682 | 682 | // Note: When this action runs the lesson status may not yet exist |
| 683 | - do_action( 'sensei_user_lesson_start', $user_id, $lesson_id ); |
|
| 683 | + do_action('sensei_user_lesson_start', $user_id, $lesson_id); |
|
| 684 | 684 | |
| 685 | - if( $complete ) { |
|
| 685 | + if ($complete) { |
|
| 686 | 686 | |
| 687 | - $has_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true ); |
|
| 688 | - if ( $has_questions ) { |
|
| 687 | + $has_questions = get_post_meta($lesson_id, '_quiz_has_questions', true); |
|
| 688 | + if ($has_questions) { |
|
| 689 | 689 | $status = 'passed'; // Force a pass |
| 690 | 690 | $metadata['grade'] = 0; |
| 691 | 691 | } |
@@ -695,31 +695,31 @@ discard block |
||
| 695 | 695 | } |
| 696 | 696 | |
| 697 | 697 | // Check if user is already taking the lesson |
| 698 | - $activity_logged = Sensei_Utils::user_started_lesson( $lesson_id, $user_id ); |
|
| 699 | - if( ! $activity_logged ) { |
|
| 698 | + $activity_logged = Sensei_Utils::user_started_lesson($lesson_id, $user_id); |
|
| 699 | + if ( ! $activity_logged) { |
|
| 700 | 700 | |
| 701 | 701 | $metadata['start'] = current_time('mysql'); |
| 702 | - $activity_logged = Sensei_Utils::update_lesson_status( $user_id, $lesson_id, $status, $metadata ); |
|
| 702 | + $activity_logged = Sensei_Utils::update_lesson_status($user_id, $lesson_id, $status, $metadata); |
|
| 703 | 703 | |
| 704 | 704 | } else { |
| 705 | 705 | |
| 706 | 706 | // if users is already taking the lesson and the status changes to complete update it |
| 707 | 707 | $current_user_activity = get_comment($activity_logged); |
| 708 | - if( $status=='complete' && |
|
| 709 | - $status != $current_user_activity->comment_approved ){ |
|
| 708 | + if ($status == 'complete' && |
|
| 709 | + $status != $current_user_activity->comment_approved) { |
|
| 710 | 710 | |
| 711 | 711 | $comment = array(); |
| 712 | 712 | $comment['comment_ID'] = $activity_logged; |
| 713 | 713 | $comment['comment_approved'] = $status; |
| 714 | - wp_update_comment( $comment ); |
|
| 714 | + wp_update_comment($comment); |
|
| 715 | 715 | |
| 716 | 716 | } |
| 717 | 717 | |
| 718 | 718 | } |
| 719 | 719 | |
| 720 | - if ( $complete ) { |
|
| 720 | + if ($complete) { |
|
| 721 | 721 | // Run this *after* the lesson status has been created/updated |
| 722 | - do_action( 'sensei_user_lesson_end', $user_id, $lesson_id ); |
|
| 722 | + do_action('sensei_user_lesson_end', $user_id, $lesson_id); |
|
| 723 | 723 | } |
| 724 | 724 | |
| 725 | 725 | } |
@@ -734,20 +734,20 @@ discard block |
||
| 734 | 734 | * @param int $user_id |
| 735 | 735 | * @return boolean |
| 736 | 736 | */ |
| 737 | - public static function sensei_remove_user_from_lesson( $lesson_id = 0, $user_id = 0, $from_course = false ) { |
|
| 737 | + public static function sensei_remove_user_from_lesson($lesson_id = 0, $user_id = 0, $from_course = false) { |
|
| 738 | 738 | |
| 739 | 739 | |
| 740 | - if( ! $lesson_id ) return false; |
|
| 740 | + if ( ! $lesson_id) return false; |
|
| 741 | 741 | |
| 742 | - if( intval( $user_id ) == 0 ) { |
|
| 742 | + if (intval($user_id) == 0) { |
|
| 743 | 743 | $user_id = get_current_user_id(); |
| 744 | 744 | } |
| 745 | 745 | |
| 746 | 746 | // Process quiz |
| 747 | - $lesson_quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); |
|
| 747 | + $lesson_quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); |
|
| 748 | 748 | |
| 749 | 749 | // Delete quiz answers, this auto deletes the corresponding meta data, such as the question/answer grade |
| 750 | - Sensei_Utils::sensei_delete_quiz_answers( $lesson_quiz_id, $user_id ); |
|
| 750 | + Sensei_Utils::sensei_delete_quiz_answers($lesson_quiz_id, $user_id); |
|
| 751 | 751 | |
| 752 | 752 | // Delete lesson status |
| 753 | 753 | $args = array( |
@@ -756,10 +756,10 @@ discard block |
||
| 756 | 756 | 'user_id' => $user_id, |
| 757 | 757 | ); |
| 758 | 758 | // This auto deletes the corresponding meta data, such as the quiz grade, and questions asked |
| 759 | - Sensei_Utils::sensei_delete_activities( $args ); |
|
| 759 | + Sensei_Utils::sensei_delete_activities($args); |
|
| 760 | 760 | |
| 761 | - if( ! $from_course ) { |
|
| 762 | - do_action( 'sensei_user_lesson_reset', $user_id, $lesson_id ); |
|
| 761 | + if ( ! $from_course) { |
|
| 762 | + do_action('sensei_user_lesson_reset', $user_id, $lesson_id); |
|
| 763 | 763 | } |
| 764 | 764 | |
| 765 | 765 | return true; |
@@ -772,19 +772,19 @@ discard block |
||
| 772 | 772 | * @param int $user_id |
| 773 | 773 | * @return boolean |
| 774 | 774 | */ |
| 775 | - public static function sensei_remove_user_from_course( $course_id = 0, $user_id = 0 ) { |
|
| 775 | + public static function sensei_remove_user_from_course($course_id = 0, $user_id = 0) { |
|
| 776 | 776 | |
| 777 | 777 | |
| 778 | - if( ! $course_id ) return false; |
|
| 778 | + if ( ! $course_id) return false; |
|
| 779 | 779 | |
| 780 | - if( intval( $user_id ) == 0 ) { |
|
| 780 | + if (intval($user_id) == 0) { |
|
| 781 | 781 | $user_id = get_current_user_id(); |
| 782 | 782 | } |
| 783 | 783 | |
| 784 | - $lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' ); |
|
| 784 | + $lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids'); |
|
| 785 | 785 | |
| 786 | - foreach( $lesson_ids as $lesson_id ) { |
|
| 787 | - Sensei_Utils::sensei_remove_user_from_lesson( $lesson_id, $user_id, true ); |
|
| 786 | + foreach ($lesson_ids as $lesson_id) { |
|
| 787 | + Sensei_Utils::sensei_remove_user_from_lesson($lesson_id, $user_id, true); |
|
| 788 | 788 | } |
| 789 | 789 | |
| 790 | 790 | // Delete course status |
@@ -794,36 +794,36 @@ discard block |
||
| 794 | 794 | 'user_id' => $user_id, |
| 795 | 795 | ); |
| 796 | 796 | |
| 797 | - Sensei_Utils::sensei_delete_activities( $args ); |
|
| 797 | + Sensei_Utils::sensei_delete_activities($args); |
|
| 798 | 798 | |
| 799 | - do_action( 'sensei_user_course_reset', $user_id, $course_id ); |
|
| 799 | + do_action('sensei_user_course_reset', $user_id, $course_id); |
|
| 800 | 800 | |
| 801 | 801 | return true; |
| 802 | 802 | } |
| 803 | 803 | |
| 804 | - public static function sensei_get_quiz_questions( $quiz_id = 0 ) { |
|
| 804 | + public static function sensei_get_quiz_questions($quiz_id = 0) { |
|
| 805 | 805 | |
| 806 | 806 | |
| 807 | 807 | $questions = array(); |
| 808 | 808 | |
| 809 | - if( intval( $quiz_id ) > 0 ) { |
|
| 810 | - $questions = Sensei()->lesson->lesson_quiz_questions( $quiz_id ); |
|
| 811 | - $questions = Sensei_Utils::array_sort_reorder( $questions ); |
|
| 809 | + if (intval($quiz_id) > 0) { |
|
| 810 | + $questions = Sensei()->lesson->lesson_quiz_questions($quiz_id); |
|
| 811 | + $questions = Sensei_Utils::array_sort_reorder($questions); |
|
| 812 | 812 | } |
| 813 | 813 | |
| 814 | 814 | return $questions; |
| 815 | 815 | } |
| 816 | 816 | |
| 817 | - public static function sensei_get_quiz_total( $quiz_id = 0 ) { |
|
| 817 | + public static function sensei_get_quiz_total($quiz_id = 0) { |
|
| 818 | 818 | |
| 819 | 819 | |
| 820 | 820 | $quiz_total = 0; |
| 821 | 821 | |
| 822 | - if( $quiz_id > 0 ) { |
|
| 823 | - $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id ); |
|
| 822 | + if ($quiz_id > 0) { |
|
| 823 | + $questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id); |
|
| 824 | 824 | $question_grade = 0; |
| 825 | - foreach( $questions as $question ) { |
|
| 826 | - $question_grade = Sensei()->question->get_question_grade( $question->ID ); |
|
| 825 | + foreach ($questions as $question) { |
|
| 826 | + $question_grade = Sensei()->question->get_question_grade($question->ID); |
|
| 827 | 827 | $quiz_total += $question_grade; |
| 828 | 828 | } |
| 829 | 829 | } |
@@ -838,20 +838,20 @@ discard block |
||
| 838 | 838 | * @param int $user_id |
| 839 | 839 | * @return string |
| 840 | 840 | */ |
| 841 | - public static function sensei_get_user_question_grade( $question = 0, $user_id = 0 ) { |
|
| 841 | + public static function sensei_get_user_question_grade($question = 0, $user_id = 0) { |
|
| 842 | 842 | $question_grade = false; |
| 843 | - if( $question ) { |
|
| 844 | - if ( is_object( $question ) ) { |
|
| 843 | + if ($question) { |
|
| 844 | + if (is_object($question)) { |
|
| 845 | 845 | $user_answer_id = $question->comment_ID; |
| 846 | 846 | } |
| 847 | 847 | else { |
| 848 | - if( intval( $user_id ) == 0 ) { |
|
| 848 | + if (intval($user_id) == 0) { |
|
| 849 | 849 | $user_id = get_current_user_id(); |
| 850 | 850 | } |
| 851 | - $user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); |
|
| 851 | + $user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); |
|
| 852 | 852 | } |
| 853 | - if ( $user_answer_id ) { |
|
| 854 | - $question_grade = get_comment_meta( $user_answer_id, 'user_grade', true ); |
|
| 853 | + if ($user_answer_id) { |
|
| 854 | + $question_grade = get_comment_meta($user_answer_id, 'user_grade', true); |
|
| 855 | 855 | } |
| 856 | 856 | } |
| 857 | 857 | |
@@ -866,52 +866,52 @@ discard block |
||
| 866 | 866 | * @param int $user_id |
| 867 | 867 | * @return string |
| 868 | 868 | */ |
| 869 | - public static function sensei_get_user_question_answer_notes( $question = 0, $user_id = 0 ) { |
|
| 869 | + public static function sensei_get_user_question_answer_notes($question = 0, $user_id = 0) { |
|
| 870 | 870 | $answer_notes = false; |
| 871 | - if( $question ) { |
|
| 872 | - if ( is_object( $question ) ) { |
|
| 871 | + if ($question) { |
|
| 872 | + if (is_object($question)) { |
|
| 873 | 873 | $user_answer_id = $question->comment_ID; |
| 874 | 874 | } |
| 875 | 875 | else { |
| 876 | - if( intval( $user_id ) == 0 ) { |
|
| 876 | + if (intval($user_id) == 0) { |
|
| 877 | 877 | $user_id = get_current_user_id(); |
| 878 | 878 | } |
| 879 | - $user_answer_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); |
|
| 879 | + $user_answer_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => intval($question), 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); |
|
| 880 | 880 | } |
| 881 | - if ( $user_answer_id ) { |
|
| 882 | - $answer_notes = base64_decode( get_comment_meta( $user_answer_id, 'answer_note', true ) ); |
|
| 881 | + if ($user_answer_id) { |
|
| 882 | + $answer_notes = base64_decode(get_comment_meta($user_answer_id, 'answer_note', true)); |
|
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | 885 | |
| 886 | 886 | return $answer_notes; |
| 887 | 887 | } |
| 888 | 888 | |
| 889 | - public static function sensei_delete_quiz_answers( $quiz_id = 0, $user_id = 0 ) { |
|
| 890 | - if( intval( $user_id ) == 0 ) { |
|
| 889 | + public static function sensei_delete_quiz_answers($quiz_id = 0, $user_id = 0) { |
|
| 890 | + if (intval($user_id) == 0) { |
|
| 891 | 891 | $user_id = get_current_user_id(); |
| 892 | 892 | } |
| 893 | 893 | |
| 894 | 894 | $delete_answers = false; |
| 895 | - if( intval( $quiz_id ) > 0 ) { |
|
| 896 | - $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id ); |
|
| 897 | - foreach( $questions as $question ) { |
|
| 898 | - $delete_answers = Sensei_Utils::sensei_delete_activities( array( 'post_id' => $question->ID, 'user_id' => $user_id, 'type' => 'sensei_user_answer' ) ); |
|
| 895 | + if (intval($quiz_id) > 0) { |
|
| 896 | + $questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id); |
|
| 897 | + foreach ($questions as $question) { |
|
| 898 | + $delete_answers = Sensei_Utils::sensei_delete_activities(array('post_id' => $question->ID, 'user_id' => $user_id, 'type' => 'sensei_user_answer')); |
|
| 899 | 899 | } |
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | return $delete_answers; |
| 903 | 903 | } |
| 904 | 904 | |
| 905 | - public static function sensei_delete_quiz_grade( $quiz_id = 0, $user_id = 0 ) { |
|
| 906 | - if( intval( $user_id ) == 0 ) { |
|
| 905 | + public static function sensei_delete_quiz_grade($quiz_id = 0, $user_id = 0) { |
|
| 906 | + if (intval($user_id) == 0) { |
|
| 907 | 907 | $user_id = get_current_user_id(); |
| 908 | 908 | } |
| 909 | 909 | |
| 910 | 910 | $delete_grade = false; |
| 911 | - if( intval( $quiz_id ) > 0 ) { |
|
| 912 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); |
|
| 913 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); |
|
| 914 | - $delete_grade = delete_comment_meta( $user_lesson_status->comment_ID, 'grade' ); |
|
| 911 | + if (intval($quiz_id) > 0) { |
|
| 912 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); |
|
| 913 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); |
|
| 914 | + $delete_grade = delete_comment_meta($user_lesson_status->comment_ID, 'grade'); |
|
| 915 | 915 | } |
| 916 | 916 | |
| 917 | 917 | return $delete_grade; |
@@ -924,20 +924,20 @@ discard block |
||
| 924 | 924 | * @param string $notes |
| 925 | 925 | * @return boolean |
| 926 | 926 | */ |
| 927 | - public static function sensei_add_answer_notes( $question_id = 0, $user_id = 0, $notes = '' ) { |
|
| 928 | - if( intval( $user_id ) == 0 ) { |
|
| 927 | + public static function sensei_add_answer_notes($question_id = 0, $user_id = 0, $notes = '') { |
|
| 928 | + if (intval($user_id) == 0) { |
|
| 929 | 929 | $user_id = get_current_user_id(); |
| 930 | 930 | } |
| 931 | 931 | |
| 932 | 932 | $activity_logged = false; |
| 933 | 933 | |
| 934 | - if( intval( $question_id ) > 0 ) { |
|
| 935 | - $notes = base64_encode( $notes ); |
|
| 934 | + if (intval($question_id) > 0) { |
|
| 935 | + $notes = base64_encode($notes); |
|
| 936 | 936 | |
| 937 | 937 | // Don't store empty values, no point |
| 938 | - if ( !empty($notes) ) { |
|
| 939 | - $user_lesson_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID' ) ); |
|
| 940 | - $activity_logged = update_comment_meta( $user_lesson_id, 'answer_note', $notes ); |
|
| 938 | + if ( ! empty($notes)) { |
|
| 939 | + $user_lesson_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $question_id, 'user_id' => $user_id, 'type' => 'sensei_user_answer', 'field' => 'comment_ID')); |
|
| 940 | + $activity_logged = update_comment_meta($user_lesson_id, 'answer_note', $notes); |
|
| 941 | 941 | } |
| 942 | 942 | else { |
| 943 | 943 | $activity_logged = true; |
@@ -953,16 +953,16 @@ discard block |
||
| 953 | 953 | * @param array $return_array data to be ordered |
| 954 | 954 | * @return array $return_array ordered data |
| 955 | 955 | */ |
| 956 | - public static function array_sort_reorder( $return_array ) { |
|
| 957 | - if ( isset( $_GET['orderby'] ) && '' != esc_html( $_GET['orderby'] ) ) { |
|
| 956 | + public static function array_sort_reorder($return_array) { |
|
| 957 | + if (isset($_GET['orderby']) && '' != esc_html($_GET['orderby'])) { |
|
| 958 | 958 | $sort_key = ''; |
| 959 | 959 | // if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->sortable_columns ) ) { |
| 960 | 960 | // $sort_key = esc_html( $_GET['orderby'] ); |
| 961 | 961 | // } // End If Statement |
| 962 | - if ( '' != $sort_key ) { |
|
| 963 | - Sensei_Utils::sort_array_by_key($return_array,$sort_key); |
|
| 964 | - if ( isset( $_GET['order'] ) && 'desc' == esc_html( $_GET['order'] ) ) { |
|
| 965 | - $return_array = array_reverse( $return_array, true ); |
|
| 962 | + if ('' != $sort_key) { |
|
| 963 | + Sensei_Utils::sort_array_by_key($return_array, $sort_key); |
|
| 964 | + if (isset($_GET['order']) && 'desc' == esc_html($_GET['order'])) { |
|
| 965 | + $return_array = array_reverse($return_array, true); |
|
| 966 | 966 | } // End If Statement |
| 967 | 967 | } // End If Statement |
| 968 | 968 | return $return_array; |
@@ -978,15 +978,15 @@ discard block |
||
| 978 | 978 | * @param $key string column name in array |
| 979 | 979 | * @return void |
| 980 | 980 | */ |
| 981 | - public static function sort_array_by_key( $array, $key ) { |
|
| 981 | + public static function sort_array_by_key($array, $key) { |
|
| 982 | 982 | $sorter = array(); |
| 983 | 983 | $ret = array(); |
| 984 | - reset( $array ); |
|
| 985 | - foreach ( $array as $ii => $va ) { |
|
| 984 | + reset($array); |
|
| 985 | + foreach ($array as $ii => $va) { |
|
| 986 | 986 | $sorter[$ii] = $va[$key]; |
| 987 | 987 | } // End For Loop |
| 988 | - asort( $sorter ); |
|
| 989 | - foreach ( $sorter as $ii => $va ) { |
|
| 988 | + asort($sorter); |
|
| 989 | + foreach ($sorter as $ii => $va) { |
|
| 990 | 990 | $ret[$ii] = $array[$ii]; |
| 991 | 991 | } // End For Loop |
| 992 | 992 | $array = $ret; |
@@ -998,10 +998,10 @@ discard block |
||
| 998 | 998 | * @param integer $quiz_id |
| 999 | 999 | * @return array of quiz questions |
| 1000 | 1000 | */ |
| 1001 | - public static function lesson_quiz_questions( $quiz_id = 0 ) { |
|
| 1001 | + public static function lesson_quiz_questions($quiz_id = 0) { |
|
| 1002 | 1002 | $questions_array = array(); |
| 1003 | - if ( 0 < $quiz_id ) { |
|
| 1004 | - $question_args = array( 'post_type' => 'question', |
|
| 1003 | + if (0 < $quiz_id) { |
|
| 1004 | + $question_args = array('post_type' => 'question', |
|
| 1005 | 1005 | 'posts_per_page' => -1, |
| 1006 | 1006 | 'orderby' => 'ID', |
| 1007 | 1007 | 'order' => 'ASC', |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | 'post_status' => 'any', |
| 1015 | 1015 | 'suppress_filters' => 0 |
| 1016 | 1016 | ); |
| 1017 | - $questions_array = get_posts( $question_args ); |
|
| 1017 | + $questions_array = get_posts($question_args); |
|
| 1018 | 1018 | } // End If Statement |
| 1019 | 1019 | return $questions_array; |
| 1020 | 1020 | } // End lesson_quiz_questions() |
@@ -1024,25 +1024,25 @@ discard block |
||
| 1024 | 1024 | * @param integer $course_id ID of course |
| 1025 | 1025 | * @return integer Pass mark for course |
| 1026 | 1026 | */ |
| 1027 | - public static function sensei_course_pass_grade( $course_id = 0 ) { |
|
| 1027 | + public static function sensei_course_pass_grade($course_id = 0) { |
|
| 1028 | 1028 | |
| 1029 | 1029 | |
| 1030 | 1030 | $course_passmark = 0; |
| 1031 | 1031 | |
| 1032 | - if( $course_id > 0 ) { |
|
| 1033 | - $lessons = Sensei()->course->course_lessons( $course_id ); |
|
| 1032 | + if ($course_id > 0) { |
|
| 1033 | + $lessons = Sensei()->course->course_lessons($course_id); |
|
| 1034 | 1034 | $lesson_count = 0; |
| 1035 | 1035 | $total_passmark = 0; |
| 1036 | - foreach( $lessons as $lesson ) { |
|
| 1036 | + foreach ($lessons as $lesson) { |
|
| 1037 | 1037 | |
| 1038 | 1038 | // Get Quiz ID |
| 1039 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson->ID ); |
|
| 1039 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson->ID); |
|
| 1040 | 1040 | |
| 1041 | 1041 | // Check for a pass being required |
| 1042 | - $pass_required = get_post_meta( $quiz_id, '_pass_required', true ); |
|
| 1043 | - if ( $pass_required ) { |
|
| 1042 | + $pass_required = get_post_meta($quiz_id, '_pass_required', true); |
|
| 1043 | + if ($pass_required) { |
|
| 1044 | 1044 | // Get quiz passmark |
| 1045 | - $quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) ); |
|
| 1045 | + $quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true)); |
|
| 1046 | 1046 | |
| 1047 | 1047 | // Add up total passmark |
| 1048 | 1048 | $total_passmark += $quiz_passmark; |
@@ -1051,12 +1051,12 @@ discard block |
||
| 1051 | 1051 | } |
| 1052 | 1052 | } |
| 1053 | 1053 | // Might be a case of no required lessons |
| 1054 | - if ( $lesson_count ) { |
|
| 1055 | - $course_passmark = ( $total_passmark / $lesson_count ); |
|
| 1054 | + if ($lesson_count) { |
|
| 1055 | + $course_passmark = ($total_passmark / $lesson_count); |
|
| 1056 | 1056 | } |
| 1057 | 1057 | } |
| 1058 | 1058 | |
| 1059 | - return Sensei_Utils::round( $course_passmark ); |
|
| 1059 | + return Sensei_Utils::round($course_passmark); |
|
| 1060 | 1060 | } |
| 1061 | 1061 | |
| 1062 | 1062 | /** |
@@ -1065,27 +1065,27 @@ discard block |
||
| 1065 | 1065 | * @param integer $user_id ID of user |
| 1066 | 1066 | * @return integer User's total grade |
| 1067 | 1067 | */ |
| 1068 | - public static function sensei_course_user_grade( $course_id = 0, $user_id = 0 ) { |
|
| 1068 | + public static function sensei_course_user_grade($course_id = 0, $user_id = 0) { |
|
| 1069 | 1069 | |
| 1070 | 1070 | |
| 1071 | - if( intval( $user_id ) == 0 ) { |
|
| 1071 | + if (intval($user_id) == 0) { |
|
| 1072 | 1072 | $user_id = get_current_user_id(); |
| 1073 | 1073 | } |
| 1074 | 1074 | |
| 1075 | 1075 | $total_grade = 0; |
| 1076 | 1076 | |
| 1077 | - if( $course_id > 0 && $user_id > 0 ) { |
|
| 1078 | - $lessons = Sensei()->course->course_lessons( $course_id ); |
|
| 1077 | + if ($course_id > 0 && $user_id > 0) { |
|
| 1078 | + $lessons = Sensei()->course->course_lessons($course_id); |
|
| 1079 | 1079 | $lesson_count = 0; |
| 1080 | 1080 | $total_grade = 0; |
| 1081 | - foreach( $lessons as $lesson ) { |
|
| 1081 | + foreach ($lessons as $lesson) { |
|
| 1082 | 1082 | |
| 1083 | 1083 | // Check for lesson having questions, thus a quiz, thus having a grade |
| 1084 | - $has_questions = get_post_meta( $lesson->ID, '_quiz_has_questions', true ); |
|
| 1085 | - if ( $has_questions ) { |
|
| 1086 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson->ID, $user_id ); |
|
| 1084 | + $has_questions = get_post_meta($lesson->ID, '_quiz_has_questions', true); |
|
| 1085 | + if ($has_questions) { |
|
| 1086 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson->ID, $user_id); |
|
| 1087 | 1087 | // Get user quiz grade |
| 1088 | - $quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true ); |
|
| 1088 | + $quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true); |
|
| 1089 | 1089 | |
| 1090 | 1090 | // Add up total grade |
| 1091 | 1091 | $total_grade += $quiz_grade; |
@@ -1095,13 +1095,13 @@ discard block |
||
| 1095 | 1095 | } |
| 1096 | 1096 | |
| 1097 | 1097 | // Might be a case of no lessons with quizzes |
| 1098 | - if ( $lesson_count ) { |
|
| 1099 | - $total_grade = ( $total_grade / $lesson_count ); |
|
| 1098 | + if ($lesson_count) { |
|
| 1099 | + $total_grade = ($total_grade / $lesson_count); |
|
| 1100 | 1100 | } |
| 1101 | 1101 | |
| 1102 | 1102 | } |
| 1103 | 1103 | |
| 1104 | - return Sensei_Utils::round( $total_grade ); |
|
| 1104 | + return Sensei_Utils::round($total_grade); |
|
| 1105 | 1105 | } |
| 1106 | 1106 | |
| 1107 | 1107 | /** |
@@ -1110,18 +1110,18 @@ discard block |
||
| 1110 | 1110 | * @param integer $user_id ID of user |
| 1111 | 1111 | * @return boolean |
| 1112 | 1112 | */ |
| 1113 | - public static function sensei_user_passed_course( $course_id = 0, $user_id = 0 ) { |
|
| 1114 | - if( intval( $user_id ) == 0 ) { |
|
| 1113 | + public static function sensei_user_passed_course($course_id = 0, $user_id = 0) { |
|
| 1114 | + if (intval($user_id) == 0) { |
|
| 1115 | 1115 | $user_id = get_current_user_id(); |
| 1116 | 1116 | } |
| 1117 | 1117 | |
| 1118 | 1118 | $pass = false; |
| 1119 | 1119 | |
| 1120 | - if( $course_id > 0 && $user_id > 0 ) { |
|
| 1121 | - $passmark = Sensei_Utils::sensei_course_pass_grade( $course_id ); |
|
| 1122 | - $user_grade = Sensei_Utils::sensei_course_user_grade( $course_id, $user_id ); |
|
| 1120 | + if ($course_id > 0 && $user_id > 0) { |
|
| 1121 | + $passmark = Sensei_Utils::sensei_course_pass_grade($course_id); |
|
| 1122 | + $user_grade = Sensei_Utils::sensei_course_user_grade($course_id, $user_id); |
|
| 1123 | 1123 | |
| 1124 | - if( $user_grade >= $passmark ) { |
|
| 1124 | + if ($user_grade >= $passmark) { |
|
| 1125 | 1125 | $pass = true; |
| 1126 | 1126 | } |
| 1127 | 1127 | } |
@@ -1136,38 +1136,38 @@ discard block |
||
| 1136 | 1136 | * @param integer $user_id ID of user |
| 1137 | 1137 | * @return array Status code and message |
| 1138 | 1138 | */ |
| 1139 | - public static function sensei_user_course_status_message( $course_id = 0, $user_id = 0 ) { |
|
| 1140 | - if( intval( $user_id ) == 0 ) { |
|
| 1139 | + public static function sensei_user_course_status_message($course_id = 0, $user_id = 0) { |
|
| 1140 | + if (intval($user_id) == 0) { |
|
| 1141 | 1141 | $user_id = get_current_user_id(); |
| 1142 | 1142 | } |
| 1143 | 1143 | |
| 1144 | 1144 | $status = 'not_started'; |
| 1145 | 1145 | $box_class = 'info'; |
| 1146 | - $message = __( 'You have not started this course yet.', 'woothemes-sensei' ); |
|
| 1146 | + $message = __('You have not started this course yet.', 'woothemes-sensei'); |
|
| 1147 | 1147 | |
| 1148 | - if( $course_id > 0 && $user_id > 0 ) { |
|
| 1148 | + if ($course_id > 0 && $user_id > 0) { |
|
| 1149 | 1149 | |
| 1150 | - $started_course = Sensei_Utils::user_started_course( $course_id, $user_id ); |
|
| 1150 | + $started_course = Sensei_Utils::user_started_course($course_id, $user_id); |
|
| 1151 | 1151 | |
| 1152 | - if( $started_course ) { |
|
| 1153 | - $passmark = Sensei_Utils::sensei_course_pass_grade( $course_id ); // This happens inside sensei_user_passed_course()! |
|
| 1154 | - $user_grade = Sensei_Utils::sensei_course_user_grade( $course_id, $user_id ); // This happens inside sensei_user_passed_course()! |
|
| 1155 | - if( $user_grade >= $passmark ) { |
|
| 1152 | + if ($started_course) { |
|
| 1153 | + $passmark = Sensei_Utils::sensei_course_pass_grade($course_id); // This happens inside sensei_user_passed_course()! |
|
| 1154 | + $user_grade = Sensei_Utils::sensei_course_user_grade($course_id, $user_id); // This happens inside sensei_user_passed_course()! |
|
| 1155 | + if ($user_grade >= $passmark) { |
|
| 1156 | 1156 | $status = 'passed'; |
| 1157 | 1157 | $box_class = 'tick'; |
| 1158 | - $message = sprintf( __( 'You have passed this course with a grade of %1$d%%.', 'woothemes-sensei' ), $user_grade ); |
|
| 1158 | + $message = sprintf(__('You have passed this course with a grade of %1$d%%.', 'woothemes-sensei'), $user_grade); |
|
| 1159 | 1159 | } else { |
| 1160 | 1160 | $status = 'failed'; |
| 1161 | 1161 | $box_class = 'alert'; |
| 1162 | - $message = sprintf( __( 'You require %1$d%% to pass this course. Your grade is %2$s%%.', 'woothemes-sensei' ), $passmark, $user_grade ); |
|
| 1162 | + $message = sprintf(__('You require %1$d%% to pass this course. Your grade is %2$s%%.', 'woothemes-sensei'), $passmark, $user_grade); |
|
| 1163 | 1163 | } |
| 1164 | 1164 | } |
| 1165 | 1165 | |
| 1166 | 1166 | } |
| 1167 | 1167 | |
| 1168 | - $message = apply_filters( 'sensei_user_course_status_' . $status, $message ); |
|
| 1168 | + $message = apply_filters('sensei_user_course_status_'.$status, $message); |
|
| 1169 | 1169 | |
| 1170 | - return array( 'status' => $status, 'box_class' => $box_class, 'message' => $message ); |
|
| 1170 | + return array('status' => $status, 'box_class' => $box_class, 'message' => $message); |
|
| 1171 | 1171 | } |
| 1172 | 1172 | |
| 1173 | 1173 | /** |
@@ -1177,94 +1177,94 @@ discard block |
||
| 1177 | 1177 | * @param bool $is_lesson |
| 1178 | 1178 | * @return array Status code and message |
| 1179 | 1179 | */ |
| 1180 | - public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id = 0, $is_lesson = false ) { |
|
| 1180 | + public static function sensei_user_quiz_status_message($lesson_id = 0, $user_id = 0, $is_lesson = false) { |
|
| 1181 | 1181 | global $current_user; |
| 1182 | - if( intval( $user_id ) == 0 ) { |
|
| 1182 | + if (intval($user_id) == 0) { |
|
| 1183 | 1183 | $user_id = $current_user->ID; |
| 1184 | 1184 | } |
| 1185 | 1185 | |
| 1186 | 1186 | $status = 'not_started'; |
| 1187 | 1187 | $box_class = 'info'; |
| 1188 | - $message = __( "You have not taken this lesson's quiz yet", 'woothemes-sensei' ); |
|
| 1188 | + $message = __("You have not taken this lesson's quiz yet", 'woothemes-sensei'); |
|
| 1189 | 1189 | $extra = ''; |
| 1190 | 1190 | |
| 1191 | - if( $lesson_id > 0 && $user_id > 0 ) { |
|
| 1191 | + if ($lesson_id > 0 && $user_id > 0) { |
|
| 1192 | 1192 | |
| 1193 | 1193 | // Prerequisite lesson |
| 1194 | - $prerequisite = get_post_meta( $lesson_id, '_lesson_prerequisite', true ); |
|
| 1194 | + $prerequisite = get_post_meta($lesson_id, '_lesson_prerequisite', true); |
|
| 1195 | 1195 | |
| 1196 | 1196 | // Course ID |
| 1197 | - $course_id = absint( get_post_meta( $lesson_id, '_lesson_course', true ) ); |
|
| 1197 | + $course_id = absint(get_post_meta($lesson_id, '_lesson_course', true)); |
|
| 1198 | 1198 | |
| 1199 | 1199 | // Has user started course |
| 1200 | - $started_course = Sensei_Utils::user_started_course( $course_id, $user_id ); |
|
| 1200 | + $started_course = Sensei_Utils::user_started_course($course_id, $user_id); |
|
| 1201 | 1201 | |
| 1202 | 1202 | // Has user completed lesson |
| 1203 | - $user_lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); |
|
| 1204 | - $lesson_complete = Sensei_Utils::user_completed_lesson( $user_lesson_status ); |
|
| 1203 | + $user_lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); |
|
| 1204 | + $lesson_complete = Sensei_Utils::user_completed_lesson($user_lesson_status); |
|
| 1205 | 1205 | |
| 1206 | 1206 | // Quiz ID |
| 1207 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); |
|
| 1207 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); |
|
| 1208 | 1208 | |
| 1209 | 1209 | // Quiz grade |
| 1210 | 1210 | $quiz_grade = 0; |
| 1211 | - if ( $user_lesson_status ) { |
|
| 1212 | - $quiz_grade = get_comment_meta( $user_lesson_status->comment_ID, 'grade', true ); |
|
| 1211 | + if ($user_lesson_status) { |
|
| 1212 | + $quiz_grade = get_comment_meta($user_lesson_status->comment_ID, 'grade', true); |
|
| 1213 | 1213 | } |
| 1214 | 1214 | |
| 1215 | 1215 | // Quiz passmark |
| 1216 | - $quiz_passmark = absint( get_post_meta( $quiz_id, '_quiz_passmark', true ) ); |
|
| 1216 | + $quiz_passmark = absint(get_post_meta($quiz_id, '_quiz_passmark', true)); |
|
| 1217 | 1217 | $quiz_passmark_float = (float) $quiz_passmark; |
| 1218 | 1218 | |
| 1219 | 1219 | // Pass required |
| 1220 | - $pass_required = get_post_meta( $quiz_id, '_pass_required', true ); |
|
| 1220 | + $pass_required = get_post_meta($quiz_id, '_pass_required', true); |
|
| 1221 | 1221 | |
| 1222 | 1222 | // Quiz questions |
| 1223 | - $has_quiz_questions = get_post_meta( $lesson_id, '_quiz_has_questions', true ); |
|
| 1223 | + $has_quiz_questions = get_post_meta($lesson_id, '_quiz_has_questions', true); |
|
| 1224 | 1224 | |
| 1225 | - if ( ! $started_course ) { |
|
| 1225 | + if ( ! $started_course) { |
|
| 1226 | 1226 | |
| 1227 | 1227 | $status = 'not_started_course'; |
| 1228 | 1228 | $box_class = 'info'; |
| 1229 | - $message = sprintf( __( 'Please sign up for %1$sthe course%2$s before taking this quiz', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $course_id ) ) . '" title="' . esc_attr( __( 'Sign Up', 'woothemes-sensei' ) ) . '">', '</a>' ); |
|
| 1229 | + $message = sprintf(__('Please sign up for %1$sthe course%2$s before taking this quiz', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($course_id)).'" title="'.esc_attr(__('Sign Up', 'woothemes-sensei')).'">', '</a>'); |
|
| 1230 | 1230 | |
| 1231 | - } elseif ( ! is_user_logged_in() ) { |
|
| 1231 | + } elseif ( ! is_user_logged_in()) { |
|
| 1232 | 1232 | |
| 1233 | 1233 | $status = 'login_required'; |
| 1234 | 1234 | $box_class = 'info'; |
| 1235 | - $message = __( 'You must be logged in to take this quiz', 'woothemes-sensei' ); |
|
| 1235 | + $message = __('You must be logged in to take this quiz', 'woothemes-sensei'); |
|
| 1236 | 1236 | |
| 1237 | 1237 | } |
| 1238 | 1238 | // Lesson/Quiz is marked as complete thus passing any quiz restrictions |
| 1239 | - elseif ( $lesson_complete ) { |
|
| 1239 | + elseif ($lesson_complete) { |
|
| 1240 | 1240 | |
| 1241 | 1241 | $status = 'passed'; |
| 1242 | 1242 | $box_class = 'tick'; |
| 1243 | 1243 | // Lesson status will be "complete" (has no Quiz) |
| 1244 | - if ( ! $has_quiz_questions ) { |
|
| 1245 | - $message = sprintf( __( 'Congratulations! You have passed this lesson.', 'woothemes-sensei' ) ); |
|
| 1244 | + if ( ! $has_quiz_questions) { |
|
| 1245 | + $message = sprintf(__('Congratulations! You have passed this lesson.', 'woothemes-sensei')); |
|
| 1246 | 1246 | } |
| 1247 | 1247 | // Lesson status will be "graded" (no passmark required so might have failed all the questions) |
| 1248 | - elseif ( empty( $quiz_grade ) ) { |
|
| 1249 | - $message = sprintf( __( 'Congratulations! You have completed this lesson.', 'woothemes-sensei' ) ); |
|
| 1248 | + elseif (empty($quiz_grade)) { |
|
| 1249 | + $message = sprintf(__('Congratulations! You have completed this lesson.', 'woothemes-sensei')); |
|
| 1250 | 1250 | } |
| 1251 | 1251 | // Lesson status will be "passed" (passmark reached) |
| 1252 | - elseif ( ! empty( $quiz_grade ) && abs( $quiz_grade ) >= 0 ) { |
|
| 1253 | - if( $is_lesson ) { |
|
| 1254 | - $message = sprintf( __( 'Congratulations! You have passed this lesson\'s quiz achieving %s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_grade ) ); |
|
| 1252 | + elseif ( ! empty($quiz_grade) && abs($quiz_grade) >= 0) { |
|
| 1253 | + if ($is_lesson) { |
|
| 1254 | + $message = sprintf(__('Congratulations! You have passed this lesson\'s quiz achieving %s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_grade)); |
|
| 1255 | 1255 | } else { |
| 1256 | - $message = sprintf( __( 'Congratulations! You have passed this quiz achieving %s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_grade ) ); |
|
| 1256 | + $message = sprintf(__('Congratulations! You have passed this quiz achieving %s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_grade)); |
|
| 1257 | 1257 | } |
| 1258 | 1258 | } |
| 1259 | 1259 | |
| 1260 | 1260 | // add next lesson button |
| 1261 | - $nav_id_array = sensei_get_prev_next_lessons( $lesson_id ); |
|
| 1262 | - $next_lesson_id = absint( $nav_id_array['next_lesson'] ); |
|
| 1261 | + $nav_id_array = sensei_get_prev_next_lessons($lesson_id); |
|
| 1262 | + $next_lesson_id = absint($nav_id_array['next_lesson']); |
|
| 1263 | 1263 | |
| 1264 | 1264 | // Output HTML |
| 1265 | - if ( ( 0 < $next_lesson_id ) ) { |
|
| 1266 | - $message .= ' ' . '<a class="next-lesson" href="' . esc_url( get_permalink( $next_lesson_id ) ) |
|
| 1267 | - . '" rel="next"><span class="meta-nav"></span>'. __( 'Next Lesson' ,'woothemes-sensei') |
|
| 1265 | + if ((0 < $next_lesson_id)) { |
|
| 1266 | + $message .= ' '.'<a class="next-lesson" href="'.esc_url(get_permalink($next_lesson_id)) |
|
| 1267 | + . '" rel="next"><span class="meta-nav"></span>'.__('Next Lesson', 'woothemes-sensei') |
|
| 1268 | 1268 | .'</a>'; |
| 1269 | 1269 | |
| 1270 | 1270 | } |
@@ -1273,33 +1273,33 @@ discard block |
||
| 1273 | 1273 | // Lesson/Quiz not complete |
| 1274 | 1274 | else { |
| 1275 | 1275 | // Lesson/Quiz isn't "complete" instead it's ungraded (previously this "state" meant that it *was* complete) |
| 1276 | - if ( isset( $user_lesson_status->comment_approved ) && 'ungraded' == $user_lesson_status->comment_approved ) { |
|
| 1276 | + if (isset($user_lesson_status->comment_approved) && 'ungraded' == $user_lesson_status->comment_approved) { |
|
| 1277 | 1277 | $status = 'complete'; |
| 1278 | 1278 | $box_class = 'info'; |
| 1279 | - if( $is_lesson ) { |
|
| 1280 | - $message = sprintf( __( 'You have completed this lesson\'s quiz and it will be graded soon. %1$sView the lesson quiz%2$s', 'woothemes-sensei' ), '<a href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' . esc_attr( get_the_title( $quiz_id ) ) . '">', '</a>' ); |
|
| 1279 | + if ($is_lesson) { |
|
| 1280 | + $message = sprintf(__('You have completed this lesson\'s quiz and it will be graded soon. %1$sView the lesson quiz%2$s', 'woothemes-sensei'), '<a href="'.esc_url(get_permalink($quiz_id)).'" title="'.esc_attr(get_the_title($quiz_id)).'">', '</a>'); |
|
| 1281 | 1281 | } else { |
| 1282 | - $message = sprintf( __( 'You have completed this quiz and it will be graded soon. You require %1$s%% to pass.', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ) ); |
|
| 1282 | + $message = sprintf(__('You have completed this quiz and it will be graded soon. You require %1$s%% to pass.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark)); |
|
| 1283 | 1283 | } |
| 1284 | 1284 | } |
| 1285 | 1285 | // Lesson status must be "failed" |
| 1286 | - elseif ( isset( $user_lesson_status->comment_approved ) && 'failed' == $user_lesson_status->comment_approved ) { |
|
| 1286 | + elseif (isset($user_lesson_status->comment_approved) && 'failed' == $user_lesson_status->comment_approved) { |
|
| 1287 | 1287 | $status = 'failed'; |
| 1288 | 1288 | $box_class = 'alert'; |
| 1289 | - if( $is_lesson ) { |
|
| 1290 | - $message = sprintf( __( 'You require %1$d%% to pass this lesson\'s quiz. Your grade is %2$s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ), Sensei_Utils::round( $quiz_grade ) ); |
|
| 1289 | + if ($is_lesson) { |
|
| 1290 | + $message = sprintf(__('You require %1$d%% to pass this lesson\'s quiz. Your grade is %2$s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark), Sensei_Utils::round($quiz_grade)); |
|
| 1291 | 1291 | } else { |
| 1292 | - $message = sprintf( __( 'You require %1$d%% to pass this quiz. Your grade is %2$s%%', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ), Sensei_Utils::round( $quiz_grade ) ); |
|
| 1292 | + $message = sprintf(__('You require %1$d%% to pass this quiz. Your grade is %2$s%%', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark), Sensei_Utils::round($quiz_grade)); |
|
| 1293 | 1293 | } |
| 1294 | 1294 | } |
| 1295 | 1295 | // Lesson/Quiz requires a pass |
| 1296 | - elseif( $pass_required ) { |
|
| 1296 | + elseif ($pass_required) { |
|
| 1297 | 1297 | $status = 'not_started'; |
| 1298 | 1298 | $box_class = 'info'; |
| 1299 | - if( $is_lesson ) { |
|
| 1300 | - $message = sprintf( __( 'You require %1$d%% to pass this lesson\'s quiz.', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ) ); |
|
| 1299 | + if ($is_lesson) { |
|
| 1300 | + $message = sprintf(__('You require %1$d%% to pass this lesson\'s quiz.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark)); |
|
| 1301 | 1301 | } else { |
| 1302 | - $message = sprintf( __( 'You require %1$d%% to pass this quiz.', 'woothemes-sensei' ), Sensei_Utils::round( $quiz_passmark ) ); |
|
| 1302 | + $message = sprintf(__('You require %1$d%% to pass this quiz.', 'woothemes-sensei'), Sensei_Utils::round($quiz_passmark)); |
|
| 1303 | 1303 | } |
| 1304 | 1304 | } |
| 1305 | 1305 | } |
@@ -1307,15 +1307,15 @@ discard block |
||
| 1307 | 1307 | } |
| 1308 | 1308 | |
| 1309 | 1309 | // Legacy filter |
| 1310 | - $message = apply_filters( 'sensei_user_quiz_status_' . $status, $message ); |
|
| 1310 | + $message = apply_filters('sensei_user_quiz_status_'.$status, $message); |
|
| 1311 | 1311 | |
| 1312 | - if( $is_lesson && ! in_array( $status, array( 'login_required', 'not_started_course' ) ) ) { |
|
| 1313 | - $quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); |
|
| 1314 | - $extra = '<p><a class="button" href="' . esc_url( get_permalink( $quiz_id ) ) . '" title="' . __( 'View the lesson quiz', 'woothemes-sensei' ) . '">' . __( 'View the lesson quiz', 'woothemes-sensei' ) . '</a></p>'; |
|
| 1312 | + if ($is_lesson && ! in_array($status, array('login_required', 'not_started_course'))) { |
|
| 1313 | + $quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); |
|
| 1314 | + $extra = '<p><a class="button" href="'.esc_url(get_permalink($quiz_id)).'" title="'.__('View the lesson quiz', 'woothemes-sensei').'">'.__('View the lesson quiz', 'woothemes-sensei').'</a></p>'; |
|
| 1315 | 1315 | } |
| 1316 | 1316 | |
| 1317 | 1317 | // Filter of all messages |
| 1318 | - return apply_filters( 'sensei_user_quiz_status', array( 'status' => $status, 'box_class' => $box_class, 'message' => $message, 'extra' => $extra ), $lesson_id, $user_id, $is_lesson ); |
|
| 1318 | + return apply_filters('sensei_user_quiz_status', array('status' => $status, 'box_class' => $box_class, 'message' => $message, 'extra' => $extra), $lesson_id, $user_id, $is_lesson); |
|
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | 1321 | /** |
@@ -1325,14 +1325,14 @@ discard block |
||
| 1325 | 1325 | * @param integer $course_id Course ID |
| 1326 | 1326 | * @return mixed boolean or comment_ID |
| 1327 | 1327 | */ |
| 1328 | - public static function user_start_course( $user_id = 0, $course_id = 0 ) { |
|
| 1328 | + public static function user_start_course($user_id = 0, $course_id = 0) { |
|
| 1329 | 1329 | |
| 1330 | 1330 | $activity_logged = false; |
| 1331 | 1331 | |
| 1332 | - if( $user_id && $course_id ) { |
|
| 1332 | + if ($user_id && $course_id) { |
|
| 1333 | 1333 | // Check if user is already on the Course |
| 1334 | - $activity_logged = Sensei_Utils::user_started_course( $course_id, $user_id ); |
|
| 1335 | - if ( ! $activity_logged ) { |
|
| 1334 | + $activity_logged = Sensei_Utils::user_started_course($course_id, $user_id); |
|
| 1335 | + if ( ! $activity_logged) { |
|
| 1336 | 1336 | |
| 1337 | 1337 | // Add user to course |
| 1338 | 1338 | $course_metadata = array( |
@@ -1341,11 +1341,11 @@ discard block |
||
| 1341 | 1341 | 'complete' => 0, |
| 1342 | 1342 | ); |
| 1343 | 1343 | |
| 1344 | - $activity_logged = Sensei_Utils::update_course_status( $user_id, $course_id, $course_status = 'in-progress', $course_metadata ); |
|
| 1344 | + $activity_logged = Sensei_Utils::update_course_status($user_id, $course_id, $course_status = 'in-progress', $course_metadata); |
|
| 1345 | 1345 | |
| 1346 | 1346 | // Allow further actions |
| 1347 | - if ( $activity_logged ) { |
|
| 1348 | - do_action( 'sensei_user_course_start', $user_id, $course_id ); |
|
| 1347 | + if ($activity_logged) { |
|
| 1348 | + do_action('sensei_user_course_start', $user_id, $course_id); |
|
| 1349 | 1349 | } |
| 1350 | 1350 | } |
| 1351 | 1351 | } |
@@ -1361,19 +1361,19 @@ discard block |
||
| 1361 | 1361 | * @param int $user_id |
| 1362 | 1362 | * @return mixed false or comment_ID |
| 1363 | 1363 | */ |
| 1364 | - public static function user_started_course( $course_id = 0, $user_id = 0 ) { |
|
| 1364 | + public static function user_started_course($course_id = 0, $user_id = 0) { |
|
| 1365 | 1365 | |
| 1366 | - if( $course_id ) { |
|
| 1367 | - if( ! $user_id ) { |
|
| 1366 | + if ($course_id) { |
|
| 1367 | + if ( ! $user_id) { |
|
| 1368 | 1368 | $user_id = get_current_user_id(); |
| 1369 | 1369 | } |
| 1370 | 1370 | |
| 1371 | - if( ! $user_id > 0 ){ |
|
| 1371 | + if ( ! $user_id > 0) { |
|
| 1372 | 1372 | return false; |
| 1373 | 1373 | } |
| 1374 | 1374 | |
| 1375 | - $user_course_status_id = Sensei_Utils::sensei_get_activity_value( array( 'post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status', 'field' => 'comment_ID' ) ); |
|
| 1376 | - if( $user_course_status_id ) { |
|
| 1375 | + $user_course_status_id = Sensei_Utils::sensei_get_activity_value(array('post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status', 'field' => 'comment_ID')); |
|
| 1376 | + if ($user_course_status_id) { |
|
| 1377 | 1377 | return $user_course_status_id; |
| 1378 | 1378 | } |
| 1379 | 1379 | } |
@@ -1388,17 +1388,17 @@ discard block |
||
| 1388 | 1388 | * @param integer $user_id User ID |
| 1389 | 1389 | * @return int |
| 1390 | 1390 | */ |
| 1391 | - public static function user_complete_course( $course_id = 0, $user_id = 0 ) { |
|
| 1391 | + public static function user_complete_course($course_id = 0, $user_id = 0) { |
|
| 1392 | 1392 | global $wp_version; |
| 1393 | 1393 | |
| 1394 | - if( $course_id ) { |
|
| 1395 | - if( ! $user_id ) { |
|
| 1394 | + if ($course_id) { |
|
| 1395 | + if ( ! $user_id) { |
|
| 1396 | 1396 | $user_id = get_current_user_id(); |
| 1397 | 1397 | } |
| 1398 | 1398 | |
| 1399 | 1399 | $course_status = 'in-progress'; |
| 1400 | 1400 | $course_metadata = array(); |
| 1401 | - $course_completion = Sensei()->settings->settings[ 'course_completion' ]; |
|
| 1401 | + $course_completion = Sensei()->settings->settings['course_completion']; |
|
| 1402 | 1402 | $lessons_completed = $total_lessons = 0; |
| 1403 | 1403 | $lesson_status_args = array( |
| 1404 | 1404 | 'user_id' => $user_id, |
@@ -1407,8 +1407,8 @@ discard block |
||
| 1407 | 1407 | ); |
| 1408 | 1408 | |
| 1409 | 1409 | // Grab all of this Courses' lessons, looping through each... |
| 1410 | - $lesson_ids = Sensei()->course->course_lessons( $course_id, 'any', 'ids' ); |
|
| 1411 | - $total_lessons = count( $lesson_ids ); |
|
| 1410 | + $lesson_ids = Sensei()->course->course_lessons($course_id, 'any', 'ids'); |
|
| 1411 | + $total_lessons = count($lesson_ids); |
|
| 1412 | 1412 | // ...if course completion not set to 'passed', and all lessons are complete or graded, |
| 1413 | 1413 | // ......then all lessons are 'passed' |
| 1414 | 1414 | // ...else if course completion is set to 'passed', check if each lesson has questions... |
@@ -1421,29 +1421,29 @@ discard block |
||
| 1421 | 1421 | // The below checks if a lesson is fully completed, though maybe should be Utils::user_completed_lesson() |
| 1422 | 1422 | $all_lesson_statuses = array(); |
| 1423 | 1423 | // In WordPress 4.1 get_comments() allows a single query to cover multiple comment_post_IDs |
| 1424 | - if ( version_compare($wp_version, '4.1', '>=') ) { |
|
| 1424 | + if (version_compare($wp_version, '4.1', '>=')) { |
|
| 1425 | 1425 | $lesson_status_args['post__in'] = $lesson_ids; |
| 1426 | - $all_lesson_statuses = Sensei_Utils::sensei_check_for_activity( $lesson_status_args, true ); |
|
| 1426 | + $all_lesson_statuses = Sensei_Utils::sensei_check_for_activity($lesson_status_args, true); |
|
| 1427 | 1427 | // Need to always return an array, even with only 1 item |
| 1428 | - if ( !is_array($all_lesson_statuses) ) { |
|
| 1429 | - $all_lesson_statuses = array( $all_lesson_statuses ); |
|
| 1428 | + if ( ! is_array($all_lesson_statuses)) { |
|
| 1429 | + $all_lesson_statuses = array($all_lesson_statuses); |
|
| 1430 | 1430 | } |
| 1431 | 1431 | } |
| 1432 | 1432 | // ...otherwise check each one |
| 1433 | 1433 | else { |
| 1434 | - foreach( $lesson_ids as $lesson_id ) { |
|
| 1434 | + foreach ($lesson_ids as $lesson_id) { |
|
| 1435 | 1435 | $lesson_status_args['post_id'] = $lesson_id; |
| 1436 | - $each_lesson_status = Sensei_Utils::sensei_check_for_activity( $lesson_status_args, true ); |
|
| 1436 | + $each_lesson_status = Sensei_Utils::sensei_check_for_activity($lesson_status_args, true); |
|
| 1437 | 1437 | // Check for valid return before using |
| 1438 | - if ( !empty($each_lesson_status->comment_approved) ) { |
|
| 1438 | + if ( ! empty($each_lesson_status->comment_approved)) { |
|
| 1439 | 1439 | $all_lesson_statuses[] = $each_lesson_status; |
| 1440 | 1440 | } |
| 1441 | 1441 | } |
| 1442 | 1442 | } |
| 1443 | - foreach( $all_lesson_statuses as $lesson_status ) { |
|
| 1443 | + foreach ($all_lesson_statuses as $lesson_status) { |
|
| 1444 | 1444 | // If lessons are complete without needing quizzes to be passed |
| 1445 | - if ( 'passed' != $course_completion ) { |
|
| 1446 | - switch ( $lesson_status->comment_approved ) { |
|
| 1445 | + if ('passed' != $course_completion) { |
|
| 1446 | + switch ($lesson_status->comment_approved) { |
|
| 1447 | 1447 | // A user cannot 'complete' a course if a lesson... |
| 1448 | 1448 | case 'in-progress': // ...is still in progress |
| 1449 | 1449 | case 'ungraded': // ...hasn't yet been graded |
@@ -1455,7 +1455,7 @@ discard block |
||
| 1455 | 1455 | } |
| 1456 | 1456 | } |
| 1457 | 1457 | else { |
| 1458 | - switch ( $lesson_status->comment_approved ) { |
|
| 1458 | + switch ($lesson_status->comment_approved) { |
|
| 1459 | 1459 | case 'complete': // Lesson has no quiz/questions |
| 1460 | 1460 | case 'graded': // Lesson has quiz, but it's not important what the grade was |
| 1461 | 1461 | case 'passed': // Lesson has quiz and the user passed |
@@ -1469,20 +1469,20 @@ discard block |
||
| 1469 | 1469 | } |
| 1470 | 1470 | } |
| 1471 | 1471 | } // Each lesson |
| 1472 | - if ( $lessons_completed == $total_lessons ) { |
|
| 1472 | + if ($lessons_completed == $total_lessons) { |
|
| 1473 | 1473 | $course_status = 'complete'; |
| 1474 | 1474 | } |
| 1475 | 1475 | |
| 1476 | 1476 | // Update meta data on how many lessons have been completed |
| 1477 | 1477 | $course_metadata['complete'] = $lessons_completed; |
| 1478 | 1478 | // update the overall percentage of the course lessons complete (or graded) compared to 'in-progress' regardless of the above |
| 1479 | - $course_metadata['percent'] = abs( round( ( doubleval( $lessons_completed ) * 100 ) / ( $total_lessons ), 0 ) ); |
|
| 1479 | + $course_metadata['percent'] = abs(round((doubleval($lessons_completed) * 100) / ($total_lessons), 0)); |
|
| 1480 | 1480 | |
| 1481 | - $activity_logged = Sensei_Utils::update_course_status( $user_id, $course_id, $course_status, $course_metadata ); |
|
| 1481 | + $activity_logged = Sensei_Utils::update_course_status($user_id, $course_id, $course_status, $course_metadata); |
|
| 1482 | 1482 | |
| 1483 | 1483 | // Allow further actions |
| 1484 | - if ( 'complete' == $course_status ) { |
|
| 1485 | - do_action( 'sensei_user_course_end', $user_id, $course_id ); |
|
| 1484 | + if ('complete' == $course_status) { |
|
| 1485 | + do_action('sensei_user_course_end', $user_id, $course_id); |
|
| 1486 | 1486 | } |
| 1487 | 1487 | return $activity_logged; |
| 1488 | 1488 | } |
@@ -1498,31 +1498,31 @@ discard block |
||
| 1498 | 1498 | * @param int $user_id |
| 1499 | 1499 | * @return boolean |
| 1500 | 1500 | */ |
| 1501 | - public static function user_completed_course( $course , $user_id = 0 ) { |
|
| 1501 | + public static function user_completed_course($course, $user_id = 0) { |
|
| 1502 | 1502 | |
| 1503 | - if( $course ) { |
|
| 1504 | - if ( is_object( $course ) && is_a( $course,'WP_Comment') ) { |
|
| 1503 | + if ($course) { |
|
| 1504 | + if (is_object($course) && is_a($course, 'WP_Comment')) { |
|
| 1505 | 1505 | $user_course_status = $course->comment_approved; |
| 1506 | 1506 | } |
| 1507 | - elseif ( !is_numeric( $course ) && ! is_a( $course,'WP_Post') ) { |
|
| 1507 | + elseif ( ! is_numeric($course) && ! is_a($course, 'WP_Post')) { |
|
| 1508 | 1508 | $user_course_status = $course; |
| 1509 | 1509 | } |
| 1510 | 1510 | else { |
| 1511 | - if( ! $user_id ) { |
|
| 1511 | + if ( ! $user_id) { |
|
| 1512 | 1512 | $user_id = get_current_user_id(); |
| 1513 | 1513 | } |
| 1514 | 1514 | |
| 1515 | - if( is_a( $course, 'WP_Post' ) ){ |
|
| 1516 | - $course = $course->ID; |
|
| 1515 | + if (is_a($course, 'WP_Post')) { |
|
| 1516 | + $course = $course->ID; |
|
| 1517 | 1517 | } |
| 1518 | 1518 | |
| 1519 | - $user_course_status = Sensei_Utils::user_course_status( $course , $user_id ); |
|
| 1520 | - if( isset( $user_course_status->comment_approved ) ){ |
|
| 1519 | + $user_course_status = Sensei_Utils::user_course_status($course, $user_id); |
|
| 1520 | + if (isset($user_course_status->comment_approved)) { |
|
| 1521 | 1521 | $user_course_status = $user_course_status->comment_approved; |
| 1522 | 1522 | } |
| 1523 | 1523 | |
| 1524 | 1524 | } |
| 1525 | - if( $user_course_status && 'complete' == $user_course_status ) { |
|
| 1525 | + if ($user_course_status && 'complete' == $user_course_status) { |
|
| 1526 | 1526 | return true; |
| 1527 | 1527 | } |
| 1528 | 1528 | } |
@@ -1537,10 +1537,10 @@ discard block |
||
| 1537 | 1537 | * @param int $user_id |
| 1538 | 1538 | * @return mixed false or comment_ID |
| 1539 | 1539 | */ |
| 1540 | - public static function user_started_lesson( $lesson_id = 0, $user_id = 0 ) { |
|
| 1540 | + public static function user_started_lesson($lesson_id = 0, $user_id = 0) { |
|
| 1541 | 1541 | |
| 1542 | - if( $lesson_id ) { |
|
| 1543 | - if( ! $user_id ) { |
|
| 1542 | + if ($lesson_id) { |
|
| 1543 | + if ( ! $user_id) { |
|
| 1544 | 1544 | $user_id = get_current_user_id(); |
| 1545 | 1545 | } |
| 1546 | 1546 | |
@@ -1550,8 +1550,8 @@ discard block |
||
| 1550 | 1550 | 'type' => 'sensei_lesson_status', |
| 1551 | 1551 | 'field' => 'comment_ID' ); |
| 1552 | 1552 | |
| 1553 | - $user_lesson_status_id = Sensei_Utils::sensei_get_activity_value( $activity_args ); |
|
| 1554 | - if( $user_lesson_status_id ) { |
|
| 1553 | + $user_lesson_status_id = Sensei_Utils::sensei_get_activity_value($activity_args); |
|
| 1554 | + if ($user_lesson_status_id) { |
|
| 1555 | 1555 | return $user_lesson_status_id; |
| 1556 | 1556 | } |
| 1557 | 1557 | } |
@@ -1566,29 +1566,29 @@ discard block |
||
| 1566 | 1566 | * @param int $user_id |
| 1567 | 1567 | * @return boolean |
| 1568 | 1568 | */ |
| 1569 | - public static function user_completed_lesson( $lesson = 0, $user_id = 0 ) { |
|
| 1569 | + public static function user_completed_lesson($lesson = 0, $user_id = 0) { |
|
| 1570 | 1570 | |
| 1571 | - if( $lesson ) { |
|
| 1571 | + if ($lesson) { |
|
| 1572 | 1572 | $lesson_id = 0; |
| 1573 | - if ( is_object( $lesson ) ) { |
|
| 1573 | + if (is_object($lesson)) { |
|
| 1574 | 1574 | $user_lesson_status = $lesson->comment_approved; |
| 1575 | 1575 | $lesson_id = $lesson->comment_post_ID; |
| 1576 | 1576 | } |
| 1577 | - elseif ( ! is_numeric( $lesson ) ) { |
|
| 1577 | + elseif ( ! is_numeric($lesson)) { |
|
| 1578 | 1578 | $user_lesson_status = $lesson; |
| 1579 | 1579 | } |
| 1580 | 1580 | else { |
| 1581 | - if( ! $user_id ) { |
|
| 1581 | + if ( ! $user_id) { |
|
| 1582 | 1582 | $user_id = get_current_user_id(); |
| 1583 | 1583 | } |
| 1584 | 1584 | |
| 1585 | 1585 | // the user is not logged in |
| 1586 | - if( ! $user_id > 0 ){ |
|
| 1586 | + if ( ! $user_id > 0) { |
|
| 1587 | 1587 | return false; |
| 1588 | 1588 | } |
| 1589 | - $_user_lesson_status = Sensei_Utils::user_lesson_status( $lesson, $user_id ); |
|
| 1589 | + $_user_lesson_status = Sensei_Utils::user_lesson_status($lesson, $user_id); |
|
| 1590 | 1590 | |
| 1591 | - if ( $_user_lesson_status ) { |
|
| 1591 | + if ($_user_lesson_status) { |
|
| 1592 | 1592 | $user_lesson_status = $_user_lesson_status->comment_approved; |
| 1593 | 1593 | } |
| 1594 | 1594 | else { |
@@ -1596,12 +1596,12 @@ discard block |
||
| 1596 | 1596 | } |
| 1597 | 1597 | $lesson_id = $lesson; |
| 1598 | 1598 | } |
| 1599 | - if ( 'in-progress' != $user_lesson_status ) { |
|
| 1599 | + if ('in-progress' != $user_lesson_status) { |
|
| 1600 | 1600 | // Check for Passed or Completed Setting |
| 1601 | 1601 | // Should we be checking for the Course completion setting? Surely that should only affect the Course completion, not bypass each Lesson setting |
| 1602 | 1602 | // $course_completion = Sensei()->settings->settings[ 'course_completion' ]; |
| 1603 | 1603 | // if ( 'passed' == $course_completion ) { |
| 1604 | - switch( $user_lesson_status ) { |
|
| 1604 | + switch ($user_lesson_status) { |
|
| 1605 | 1605 | case 'complete': |
| 1606 | 1606 | case 'graded': |
| 1607 | 1607 | case 'passed': |
@@ -1610,13 +1610,13 @@ discard block |
||
| 1610 | 1610 | |
| 1611 | 1611 | case 'failed': |
| 1612 | 1612 | // This may be 'completed' depending on... |
| 1613 | - if ( $lesson_id ) { |
|
| 1613 | + if ($lesson_id) { |
|
| 1614 | 1614 | // Get Quiz ID, this won't be needed once all Quiz meta fields are stored on the Lesson |
| 1615 | - $lesson_quiz_id = Sensei()->lesson->lesson_quizzes( $lesson_id ); |
|
| 1616 | - if ( $lesson_quiz_id ) { |
|
| 1615 | + $lesson_quiz_id = Sensei()->lesson->lesson_quizzes($lesson_id); |
|
| 1616 | + if ($lesson_quiz_id) { |
|
| 1617 | 1617 | // ...the quiz pass setting |
| 1618 | - $pass_required = get_post_meta( $lesson_quiz_id, '_pass_required', true ); |
|
| 1619 | - if ( empty($pass_required) ) { |
|
| 1618 | + $pass_required = get_post_meta($lesson_quiz_id, '_pass_required', true); |
|
| 1619 | + if (empty($pass_required)) { |
|
| 1620 | 1620 | // We just require the user to have done the quiz, not to have passed |
| 1621 | 1621 | return true; |
| 1622 | 1622 | } |
@@ -1639,15 +1639,15 @@ discard block |
||
| 1639 | 1639 | * @param int $user_id |
| 1640 | 1640 | * @return object |
| 1641 | 1641 | */ |
| 1642 | - public static function user_course_status( $course_id = 0, $user_id = 0 ) { |
|
| 1642 | + public static function user_course_status($course_id = 0, $user_id = 0) { |
|
| 1643 | 1643 | |
| 1644 | 1644 | |
| 1645 | - if( $course_id ) { |
|
| 1646 | - if( ! $user_id ) { |
|
| 1645 | + if ($course_id) { |
|
| 1646 | + if ( ! $user_id) { |
|
| 1647 | 1647 | $user_id = get_current_user_id(); |
| 1648 | 1648 | } |
| 1649 | 1649 | |
| 1650 | - $user_course_status = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status' ), true ); |
|
| 1650 | + $user_course_status = Sensei_Utils::sensei_check_for_activity(array('post_id' => $course_id, 'user_id' => $user_id, 'type' => 'sensei_course_status'), true); |
|
| 1651 | 1651 | return $user_course_status; |
| 1652 | 1652 | } |
| 1653 | 1653 | |
@@ -1662,27 +1662,27 @@ discard block |
||
| 1662 | 1662 | * @param int $user_id |
| 1663 | 1663 | * @return object | bool |
| 1664 | 1664 | */ |
| 1665 | - public static function user_lesson_status( $lesson_id = 0, $user_id = 0 ) { |
|
| 1665 | + public static function user_lesson_status($lesson_id = 0, $user_id = 0) { |
|
| 1666 | 1666 | |
| 1667 | - if( ! $user_id ) { |
|
| 1667 | + if ( ! $user_id) { |
|
| 1668 | 1668 | $user_id = get_current_user_id(); |
| 1669 | 1669 | } |
| 1670 | 1670 | |
| 1671 | - if( $lesson_id > 0 && $user_id > 0 ) { |
|
| 1671 | + if ($lesson_id > 0 && $user_id > 0) { |
|
| 1672 | 1672 | |
| 1673 | - $user_lesson_status = Sensei_Utils::sensei_check_for_activity( array( 'post_id' => $lesson_id, 'user_id' => $user_id, 'type' => 'sensei_lesson_status' ), true ); |
|
| 1673 | + $user_lesson_status = Sensei_Utils::sensei_check_for_activity(array('post_id' => $lesson_id, 'user_id' => $user_id, 'type' => 'sensei_lesson_status'), true); |
|
| 1674 | 1674 | return $user_lesson_status; |
| 1675 | 1675 | } |
| 1676 | 1676 | |
| 1677 | 1677 | return false; |
| 1678 | 1678 | } |
| 1679 | 1679 | |
| 1680 | - public static function is_preview_lesson( $lesson_id ) { |
|
| 1680 | + public static function is_preview_lesson($lesson_id) { |
|
| 1681 | 1681 | $is_preview = false; |
| 1682 | 1682 | |
| 1683 | - if( 'lesson' == get_post_type( $lesson_id ) ) { |
|
| 1684 | - $lesson_preview = get_post_meta( $lesson_id, '_lesson_preview', true ); |
|
| 1685 | - if ( isset( $lesson_preview ) && '' != $lesson_preview ) { |
|
| 1683 | + if ('lesson' == get_post_type($lesson_id)) { |
|
| 1684 | + $lesson_preview = get_post_meta($lesson_id, '_lesson_preview', true); |
|
| 1685 | + if (isset($lesson_preview) && '' != $lesson_preview) { |
|
| 1686 | 1686 | $is_preview = true; |
| 1687 | 1687 | } |
| 1688 | 1688 | } |
@@ -1690,22 +1690,22 @@ discard block |
||
| 1690 | 1690 | return $is_preview; |
| 1691 | 1691 | } |
| 1692 | 1692 | |
| 1693 | - public static function user_passed_quiz( $quiz_id = 0, $user_id = 0 ) { |
|
| 1693 | + public static function user_passed_quiz($quiz_id = 0, $user_id = 0) { |
|
| 1694 | 1694 | |
| 1695 | - if( ! $quiz_id ) return false; |
|
| 1695 | + if ( ! $quiz_id) return false; |
|
| 1696 | 1696 | |
| 1697 | - if( ! $user_id ) { |
|
| 1697 | + if ( ! $user_id) { |
|
| 1698 | 1698 | $user_id = get_current_user_id(); |
| 1699 | 1699 | } |
| 1700 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); |
|
| 1700 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); |
|
| 1701 | 1701 | |
| 1702 | 1702 | // Quiz Grade |
| 1703 | - $lesson_status = Sensei_Utils::user_lesson_status( $lesson_id, $user_id ); |
|
| 1704 | - $quiz_grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true ); |
|
| 1703 | + $lesson_status = Sensei_Utils::user_lesson_status($lesson_id, $user_id); |
|
| 1704 | + $quiz_grade = get_comment_meta($lesson_status->comment_ID, 'grade', true); |
|
| 1705 | 1705 | |
| 1706 | 1706 | // Check if Grade is greater than or equal to pass percentage |
| 1707 | - $quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) ); |
|
| 1708 | - if ( $quiz_passmark <= intval( $quiz_grade ) ) { |
|
| 1707 | + $quiz_passmark = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2)); |
|
| 1708 | + if ($quiz_passmark <= intval($quiz_grade)) { |
|
| 1709 | 1709 | return true; |
| 1710 | 1710 | } |
| 1711 | 1711 | |
@@ -1725,9 +1725,9 @@ discard block |
||
| 1725 | 1725 | * |
| 1726 | 1726 | * @return mixed false or comment_ID |
| 1727 | 1727 | */ |
| 1728 | - public static function update_lesson_status( $user_id, $lesson_id, $status = 'in-progress', $metadata = array() ) { |
|
| 1728 | + public static function update_lesson_status($user_id, $lesson_id, $status = 'in-progress', $metadata = array()) { |
|
| 1729 | 1729 | $comment_id = false; |
| 1730 | - if ( !empty($status) ) { |
|
| 1730 | + if ( ! empty($status)) { |
|
| 1731 | 1731 | $args = array( |
| 1732 | 1732 | 'user_id' => $user_id, |
| 1733 | 1733 | 'post_id' => $lesson_id, |
@@ -1736,18 +1736,18 @@ discard block |
||
| 1736 | 1736 | 'action' => 'update', // Update the existing status... |
| 1737 | 1737 | 'keep_time' => true, // ...but don't change the existing timestamp |
| 1738 | 1738 | ); |
| 1739 | - if( 'in-progress' == $status ) { |
|
| 1740 | - unset( $args['keep_time'] ); // Keep updating what's happened |
|
| 1739 | + if ('in-progress' == $status) { |
|
| 1740 | + unset($args['keep_time']); // Keep updating what's happened |
|
| 1741 | 1741 | } |
| 1742 | 1742 | |
| 1743 | - $comment_id = Sensei_Utils::sensei_log_activity( $args ); |
|
| 1744 | - if ( $comment_id && !empty($metadata) ) { |
|
| 1745 | - foreach( $metadata as $key => $value ) { |
|
| 1746 | - update_comment_meta( $comment_id, $key, $value ); |
|
| 1743 | + $comment_id = Sensei_Utils::sensei_log_activity($args); |
|
| 1744 | + if ($comment_id && ! empty($metadata)) { |
|
| 1745 | + foreach ($metadata as $key => $value) { |
|
| 1746 | + update_comment_meta($comment_id, $key, $value); |
|
| 1747 | 1747 | } |
| 1748 | 1748 | } |
| 1749 | 1749 | |
| 1750 | - do_action( 'sensei_lesson_status_updated', $status, $user_id, $lesson_id, $comment_id ); |
|
| 1750 | + do_action('sensei_lesson_status_updated', $status, $user_id, $lesson_id, $comment_id); |
|
| 1751 | 1751 | } |
| 1752 | 1752 | return $comment_id; |
| 1753 | 1753 | } |
@@ -1763,9 +1763,9 @@ discard block |
||
| 1763 | 1763 | * @param array $metadata |
| 1764 | 1764 | * @return mixed false or comment_ID |
| 1765 | 1765 | */ |
| 1766 | - public static function update_course_status( $user_id, $course_id, $status = 'in-progress', $metadata = array() ) { |
|
| 1766 | + public static function update_course_status($user_id, $course_id, $status = 'in-progress', $metadata = array()) { |
|
| 1767 | 1767 | $comment_id = false; |
| 1768 | - if ( !empty($status) ) { |
|
| 1768 | + if ( ! empty($status)) { |
|
| 1769 | 1769 | $args = array( |
| 1770 | 1770 | 'user_id' => $user_id, |
| 1771 | 1771 | 'post_id' => $course_id, |
@@ -1774,17 +1774,17 @@ discard block |
||
| 1774 | 1774 | 'action' => 'update', // Update the existing status... |
| 1775 | 1775 | 'keep_time' => true, // ...but don't change the existing timestamp |
| 1776 | 1776 | ); |
| 1777 | - if( 'in-progress' == $status ) { |
|
| 1778 | - unset( $args['keep_time'] ); // Keep updating what's happened |
|
| 1777 | + if ('in-progress' == $status) { |
|
| 1778 | + unset($args['keep_time']); // Keep updating what's happened |
|
| 1779 | 1779 | } |
| 1780 | 1780 | |
| 1781 | - $comment_id = Sensei_Utils::sensei_log_activity( $args ); |
|
| 1782 | - if ( $comment_id && !empty($metadata) ) { |
|
| 1783 | - foreach( $metadata as $key => $value ) { |
|
| 1784 | - update_comment_meta( $comment_id, $key, $value ); |
|
| 1781 | + $comment_id = Sensei_Utils::sensei_log_activity($args); |
|
| 1782 | + if ($comment_id && ! empty($metadata)) { |
|
| 1783 | + foreach ($metadata as $key => $value) { |
|
| 1784 | + update_comment_meta($comment_id, $key, $value); |
|
| 1785 | 1785 | } |
| 1786 | 1786 | } |
| 1787 | - do_action( 'sensei_course_status_updated', $status, $user_id, $course_id, $comment_id ); |
|
| 1787 | + do_action('sensei_course_status_updated', $status, $user_id, $course_id, $comment_id); |
|
| 1788 | 1788 | } |
| 1789 | 1789 | return $comment_id; |
| 1790 | 1790 | } |
@@ -1796,9 +1796,9 @@ discard block |
||
| 1796 | 1796 | * @param array $pieces (default: array()) |
| 1797 | 1797 | * @return array |
| 1798 | 1798 | */ |
| 1799 | - public static function single_comment_filter( $pieces ) { |
|
| 1800 | - unset( $pieces['orderby'] ); |
|
| 1801 | - unset( $pieces['order'] ); |
|
| 1799 | + public static function single_comment_filter($pieces) { |
|
| 1800 | + unset($pieces['orderby']); |
|
| 1801 | + unset($pieces['order']); |
|
| 1802 | 1802 | |
| 1803 | 1803 | return $pieces; |
| 1804 | 1804 | } |
@@ -1810,9 +1810,9 @@ discard block |
||
| 1810 | 1810 | * @param array $pieces (default: array()) |
| 1811 | 1811 | * @return array |
| 1812 | 1812 | */ |
| 1813 | - public static function comment_any_status_filter( $pieces ) { |
|
| 1813 | + public static function comment_any_status_filter($pieces) { |
|
| 1814 | 1814 | |
| 1815 | - $pieces['where'] = str_replace( array( "( comment_approved = '0' OR comment_approved = '1' ) AND", "comment_approved = 'any' AND" ), '', $pieces['where'] ); |
|
| 1815 | + $pieces['where'] = str_replace(array("( comment_approved = '0' OR comment_approved = '1' ) AND", "comment_approved = 'any' AND"), '', $pieces['where']); |
|
| 1816 | 1816 | |
| 1817 | 1817 | return $pieces; |
| 1818 | 1818 | } |
@@ -1824,12 +1824,12 @@ discard block |
||
| 1824 | 1824 | * @param array $pieces (default: array()) |
| 1825 | 1825 | * @return array |
| 1826 | 1826 | */ |
| 1827 | - public static function comment_multiple_status_filter( $pieces ) { |
|
| 1827 | + public static function comment_multiple_status_filter($pieces) { |
|
| 1828 | 1828 | |
| 1829 | - preg_match( "/^comment_approved = '([a-z\-\,]+)'/", $pieces['where'], $placeholder ); |
|
| 1830 | - if ( !empty($placeholder[1]) ) { |
|
| 1831 | - $statuses = explode( ',', $placeholder[1] ); |
|
| 1832 | - $pieces['where'] = str_replace( "comment_approved = '" . $placeholder[1] . "'", "comment_approved IN ('". implode( "', '", $statuses ) . "')", $pieces['where'] ); |
|
| 1829 | + preg_match("/^comment_approved = '([a-z\-\,]+)'/", $pieces['where'], $placeholder); |
|
| 1830 | + if ( ! empty($placeholder[1])) { |
|
| 1831 | + $statuses = explode(',', $placeholder[1]); |
|
| 1832 | + $pieces['where'] = str_replace("comment_approved = '".$placeholder[1]."'", "comment_approved IN ('".implode("', '", $statuses)."')", $pieces['where']); |
|
| 1833 | 1833 | } |
| 1834 | 1834 | |
| 1835 | 1835 | return $pieces; |
@@ -1841,12 +1841,12 @@ discard block |
||
| 1841 | 1841 | * @param array $pieces |
| 1842 | 1842 | * @return array $pieces |
| 1843 | 1843 | */ |
| 1844 | - public static function comment_total_sum_meta_value_filter( $pieces ) { |
|
| 1844 | + public static function comment_total_sum_meta_value_filter($pieces) { |
|
| 1845 | 1845 | global $wpdb, $wp_version; |
| 1846 | 1846 | |
| 1847 | 1847 | $pieces['fields'] = " COUNT(*) AS total, SUM($wpdb->commentmeta.meta_value) AS meta_sum "; |
| 1848 | - unset( $pieces['groupby'] ); |
|
| 1849 | - if ( version_compare($wp_version, '4.1', '>=') ) { |
|
| 1848 | + unset($pieces['groupby']); |
|
| 1849 | + if (version_compare($wp_version, '4.1', '>=')) { |
|
| 1850 | 1850 | $args['order'] = false; |
| 1851 | 1851 | $args['orderby'] = false; |
| 1852 | 1852 | } |
@@ -1861,12 +1861,12 @@ discard block |
||
| 1861 | 1861 | * @param array $pieces (default: array()) |
| 1862 | 1862 | * @return array |
| 1863 | 1863 | */ |
| 1864 | - public static function get_posts_count_only_filter( $pieces ) { |
|
| 1864 | + public static function get_posts_count_only_filter($pieces) { |
|
| 1865 | 1865 | global $wp_version; |
| 1866 | 1866 | |
| 1867 | 1867 | $pieces['fields'] = " COUNT(*) AS total "; |
| 1868 | - unset( $pieces['groupby'] ); |
|
| 1869 | - if ( version_compare($wp_version, '4.1', '>=') ) { |
|
| 1868 | + unset($pieces['groupby']); |
|
| 1869 | + if (version_compare($wp_version, '4.1', '>=')) { |
|
| 1870 | 1870 | $args['order'] = false; |
| 1871 | 1871 | $args['orderby'] = false; |
| 1872 | 1872 | } |
@@ -1885,9 +1885,9 @@ discard block |
||
| 1885 | 1885 | * |
| 1886 | 1886 | * @return bool $success |
| 1887 | 1887 | */ |
| 1888 | - public static function add_user_data( $data_key, $post_id , $value = '' , $user_id = 0 ){ |
|
| 1888 | + public static function add_user_data($data_key, $post_id, $value = '', $user_id = 0) { |
|
| 1889 | 1889 | |
| 1890 | - return self::update_user_data( $data_key, $post_id, $value , $user_id ); |
|
| 1890 | + return self::update_user_data($data_key, $post_id, $value, $user_id); |
|
| 1891 | 1891 | |
| 1892 | 1892 | }// end add_user_data |
| 1893 | 1893 | |
@@ -1906,18 +1906,18 @@ discard block |
||
| 1906 | 1906 | * |
| 1907 | 1907 | * @return bool $success |
| 1908 | 1908 | */ |
| 1909 | - public static function update_user_data( $data_key, $post_id, $value = '' , $user_id = 0 ){ |
|
| 1909 | + public static function update_user_data($data_key, $post_id, $value = '', $user_id = 0) { |
|
| 1910 | 1910 | |
| 1911 | - if( ! ( $user_id > 0 ) ){ |
|
| 1911 | + if ( ! ($user_id > 0)) { |
|
| 1912 | 1912 | $user_id = get_current_user_id(); |
| 1913 | 1913 | } |
| 1914 | 1914 | |
| 1915 | - $supported_post_types = array( 'course', 'lesson' ); |
|
| 1916 | - $post_type = get_post_type( $post_id ); |
|
| 1917 | - if( empty( $post_id ) || empty( $data_key ) |
|
| 1918 | - || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 ) |
|
| 1919 | - || !get_userdata( $user_id ) |
|
| 1920 | - || ! in_array( $post_type, $supported_post_types ) ){ |
|
| 1915 | + $supported_post_types = array('course', 'lesson'); |
|
| 1916 | + $post_type = get_post_type($post_id); |
|
| 1917 | + if (empty($post_id) || empty($data_key) |
|
| 1918 | + || ! is_int($post_id) || ! (intval($post_id) > 0) || ! (intval($user_id) > 0) |
|
| 1919 | + || ! get_userdata($user_id) |
|
| 1920 | + || ! in_array($post_type, $supported_post_types)) { |
|
| 1921 | 1921 | |
| 1922 | 1922 | return false; |
| 1923 | 1923 | } |
@@ -1925,20 +1925,20 @@ discard block |
||
| 1925 | 1925 | // check if there and existing Sensei status on this post type if not create it |
| 1926 | 1926 | // and get the activity ID |
| 1927 | 1927 | $status_function = 'user_'.$post_type.'_status'; |
| 1928 | - $sensei_user_status = self::$status_function( $post_id ,$user_id ); |
|
| 1929 | - if( ! isset( $sensei_user_status->comment_ID ) ){ |
|
| 1928 | + $sensei_user_status = self::$status_function($post_id, $user_id); |
|
| 1929 | + if ( ! isset($sensei_user_status->comment_ID)) { |
|
| 1930 | 1930 | |
| 1931 | 1931 | $start_function = 'user_start_'.$post_type; |
| 1932 | - $sensei_user_activity_id = self::$start_function( $user_id, $post_id ); |
|
| 1932 | + $sensei_user_activity_id = self::$start_function($user_id, $post_id); |
|
| 1933 | 1933 | |
| 1934 | - }else{ |
|
| 1934 | + } else { |
|
| 1935 | 1935 | |
| 1936 | 1936 | $sensei_user_activity_id = $sensei_user_status->comment_ID; |
| 1937 | 1937 | |
| 1938 | 1938 | } |
| 1939 | 1939 | |
| 1940 | 1940 | // store the data |
| 1941 | - $success = update_comment_meta( $sensei_user_activity_id, $data_key, $value ); |
|
| 1941 | + $success = update_comment_meta($sensei_user_activity_id, $data_key, $value); |
|
| 1942 | 1942 | |
| 1943 | 1943 | return $success; |
| 1944 | 1944 | |
@@ -1957,20 +1957,20 @@ discard block |
||
| 1957 | 1957 | * |
| 1958 | 1958 | * @return mixed $user_data_value |
| 1959 | 1959 | */ |
| 1960 | - public static function get_user_data( $data_key, $post_id, $user_id = 0 ){ |
|
| 1960 | + public static function get_user_data($data_key, $post_id, $user_id = 0) { |
|
| 1961 | 1961 | |
| 1962 | 1962 | $user_data_value = true; |
| 1963 | 1963 | |
| 1964 | - if( ! ( $user_id > 0 ) ){ |
|
| 1964 | + if ( ! ($user_id > 0)) { |
|
| 1965 | 1965 | $user_id = get_current_user_id(); |
| 1966 | 1966 | } |
| 1967 | 1967 | |
| 1968 | - $supported_post_types = array( 'course', 'lesson' ); |
|
| 1969 | - $post_type = get_post_type( $post_id ); |
|
| 1970 | - if( empty( $post_id ) || empty( $data_key ) |
|
| 1971 | - || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 ) |
|
| 1972 | - || ! get_userdata( $user_id ) |
|
| 1973 | - || !in_array( $post_type, $supported_post_types ) ){ |
|
| 1968 | + $supported_post_types = array('course', 'lesson'); |
|
| 1969 | + $post_type = get_post_type($post_id); |
|
| 1970 | + if (empty($post_id) || empty($data_key) |
|
| 1971 | + || ! (intval($post_id) > 0) || ! (intval($user_id) > 0) |
|
| 1972 | + || ! get_userdata($user_id) |
|
| 1973 | + || ! in_array($post_type, $supported_post_types)) { |
|
| 1974 | 1974 | |
| 1975 | 1975 | return false; |
| 1976 | 1976 | } |
@@ -1978,13 +1978,13 @@ discard block |
||
| 1978 | 1978 | // check if there and existing Sensei status on this post type if not create it |
| 1979 | 1979 | // and get the activity ID |
| 1980 | 1980 | $status_function = 'user_'.$post_type.'_status'; |
| 1981 | - $sensei_user_status = self::$status_function( $post_id ,$user_id ); |
|
| 1982 | - if( ! isset( $sensei_user_status->comment_ID ) ){ |
|
| 1981 | + $sensei_user_status = self::$status_function($post_id, $user_id); |
|
| 1982 | + if ( ! isset($sensei_user_status->comment_ID)) { |
|
| 1983 | 1983 | return false; |
| 1984 | 1984 | } |
| 1985 | 1985 | |
| 1986 | 1986 | $sensei_user_activity_id = $sensei_user_status->comment_ID; |
| 1987 | - $user_data_value = get_comment_meta( $sensei_user_activity_id , $data_key, true ); |
|
| 1987 | + $user_data_value = get_comment_meta($sensei_user_activity_id, $data_key, true); |
|
| 1988 | 1988 | |
| 1989 | 1989 | return $user_data_value; |
| 1990 | 1990 | |
@@ -1999,19 +1999,19 @@ discard block |
||
| 1999 | 1999 | * |
| 2000 | 2000 | * @return bool $deleted |
| 2001 | 2001 | */ |
| 2002 | - public static function delete_user_data( $data_key, $post_id , $user_id ){ |
|
| 2002 | + public static function delete_user_data($data_key, $post_id, $user_id) { |
|
| 2003 | 2003 | $deleted = true; |
| 2004 | 2004 | |
| 2005 | - if( ! ( $user_id > 0 ) ){ |
|
| 2005 | + if ( ! ($user_id > 0)) { |
|
| 2006 | 2006 | $user_id = get_current_user_id(); |
| 2007 | 2007 | } |
| 2008 | 2008 | |
| 2009 | - $supported_post_types = array( 'course', 'lesson' ); |
|
| 2010 | - $post_type = get_post_type( $post_id ); |
|
| 2011 | - if( empty( $post_id ) || empty( $data_key ) |
|
| 2012 | - || ! is_int( $post_id ) || ! ( intval( $post_id ) > 0 ) || ! ( intval( $user_id ) > 0 ) |
|
| 2013 | - || ! get_userdata( $user_id ) |
|
| 2014 | - || !in_array( $post_type, $supported_post_types ) ){ |
|
| 2009 | + $supported_post_types = array('course', 'lesson'); |
|
| 2010 | + $post_type = get_post_type($post_id); |
|
| 2011 | + if (empty($post_id) || empty($data_key) |
|
| 2012 | + || ! is_int($post_id) || ! (intval($post_id) > 0) || ! (intval($user_id) > 0) |
|
| 2013 | + || ! get_userdata($user_id) |
|
| 2014 | + || ! in_array($post_type, $supported_post_types)) { |
|
| 2015 | 2015 | |
| 2016 | 2016 | return false; |
| 2017 | 2017 | } |
@@ -2019,13 +2019,13 @@ discard block |
||
| 2019 | 2019 | // check if there and existing Sensei status on this post type if not create it |
| 2020 | 2020 | // and get the activity ID |
| 2021 | 2021 | $status_function = 'user_'.$post_type.'_status'; |
| 2022 | - $sensei_user_status = self::$status_function( $post_id ,$user_id ); |
|
| 2023 | - if( ! isset( $sensei_user_status->comment_ID ) ){ |
|
| 2022 | + $sensei_user_status = self::$status_function($post_id, $user_id); |
|
| 2023 | + if ( ! isset($sensei_user_status->comment_ID)) { |
|
| 2024 | 2024 | return false; |
| 2025 | 2025 | } |
| 2026 | 2026 | |
| 2027 | 2027 | $sensei_user_activity_id = $sensei_user_status->comment_ID; |
| 2028 | - $deleted = delete_comment_meta( $sensei_user_activity_id , $data_key ); |
|
| 2028 | + $deleted = delete_comment_meta($sensei_user_activity_id, $data_key); |
|
| 2029 | 2029 | |
| 2030 | 2030 | return $deleted; |
| 2031 | 2031 | |
@@ -2050,62 +2050,62 @@ discard block |
||
| 2050 | 2050 | * |
| 2051 | 2051 | * @return string $drop_down_element |
| 2052 | 2052 | */ |
| 2053 | - public static function generate_drop_down( $selected_value, $options = array() , $attributes = array(), $enable_none_option = true ) { |
|
| 2053 | + public static function generate_drop_down($selected_value, $options = array(), $attributes = array(), $enable_none_option = true) { |
|
| 2054 | 2054 | |
| 2055 | 2055 | $drop_down_element = ''; |
| 2056 | 2056 | |
| 2057 | 2057 | // setup the basic attributes |
| 2058 | - if( !isset( $attributes['name'] ) || empty( $attributes['name'] ) ) { |
|
| 2058 | + if ( ! isset($attributes['name']) || empty($attributes['name'])) { |
|
| 2059 | 2059 | |
| 2060 | 2060 | $attributes['name'] = 'sensei-options'; |
| 2061 | 2061 | |
| 2062 | 2062 | } |
| 2063 | 2063 | |
| 2064 | - if( !isset( $attributes['id'] ) || empty( $attributes['id'] ) ) { |
|
| 2064 | + if ( ! isset($attributes['id']) || empty($attributes['id'])) { |
|
| 2065 | 2065 | |
| 2066 | 2066 | $attributes['id'] = 'sensei-options'; |
| 2067 | 2067 | |
| 2068 | 2068 | } |
| 2069 | 2069 | |
| 2070 | - if( !isset( $attributes['class'] ) || empty( $attributes['class'] ) ) { |
|
| 2070 | + if ( ! isset($attributes['class']) || empty($attributes['class'])) { |
|
| 2071 | 2071 | |
| 2072 | - $attributes['class'] ='chosen_select widefat'; |
|
| 2072 | + $attributes['class'] = 'chosen_select widefat'; |
|
| 2073 | 2073 | |
| 2074 | 2074 | } |
| 2075 | 2075 | |
| 2076 | 2076 | // create element attributes |
| 2077 | 2077 | $combined_attributes = ''; |
| 2078 | - foreach( $attributes as $attribute => $value ){ |
|
| 2078 | + foreach ($attributes as $attribute => $value) { |
|
| 2079 | 2079 | |
| 2080 | - $combined_attributes .= $attribute . '="'.$value.'"' . ' '; |
|
| 2080 | + $combined_attributes .= $attribute.'="'.$value.'"'.' '; |
|
| 2081 | 2081 | |
| 2082 | 2082 | }// end for each |
| 2083 | 2083 | |
| 2084 | 2084 | |
| 2085 | 2085 | // create the select element |
| 2086 | - $drop_down_element .= '<select '. $combined_attributes . ' >' . "\n"; |
|
| 2086 | + $drop_down_element .= '<select '.$combined_attributes.' >'."\n"; |
|
| 2087 | 2087 | |
| 2088 | 2088 | // show the none option if the client requested |
| 2089 | - if( $enable_none_option ) { |
|
| 2090 | - $drop_down_element .= '<option value="">' . __('None', 'woothemes-sensei') . '</option>'; |
|
| 2089 | + if ($enable_none_option) { |
|
| 2090 | + $drop_down_element .= '<option value="">'.__('None', 'woothemes-sensei').'</option>'; |
|
| 2091 | 2091 | } |
| 2092 | 2092 | |
| 2093 | - if ( count( $options ) > 0 ) { |
|
| 2093 | + if (count($options) > 0) { |
|
| 2094 | 2094 | |
| 2095 | - foreach ($options as $value => $option ){ |
|
| 2095 | + foreach ($options as $value => $option) { |
|
| 2096 | 2096 | |
| 2097 | 2097 | $element = ''; |
| 2098 | - $element.= '<option value="' . esc_attr( $value ) . '"'; |
|
| 2099 | - $element .= selected( $value, $selected_value, false ) . '>'; |
|
| 2100 | - $element .= esc_html( $option ) . '</option>' . "\n"; |
|
| 2098 | + $element .= '<option value="'.esc_attr($value).'"'; |
|
| 2099 | + $element .= selected($value, $selected_value, false).'>'; |
|
| 2100 | + $element .= esc_html($option).'</option>'."\n"; |
|
| 2101 | 2101 | |
| 2102 | 2102 | // add the element to the select html |
| 2103 | - $drop_down_element.= $element; |
|
| 2103 | + $drop_down_element .= $element; |
|
| 2104 | 2104 | } // End For Loop |
| 2105 | 2105 | |
| 2106 | 2106 | } // End If Statement |
| 2107 | 2107 | |
| 2108 | - $drop_down_element .= '</select>' . "\n"; |
|
| 2108 | + $drop_down_element .= '</select>'."\n"; |
|
| 2109 | 2109 | |
| 2110 | 2110 | return $drop_down_element; |
| 2111 | 2111 | |
@@ -2125,14 +2125,14 @@ discard block |
||
| 2125 | 2125 | * |
| 2126 | 2126 | * @return double $val |
| 2127 | 2127 | */ |
| 2128 | - public static function round( $val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = '' ){ |
|
| 2128 | + public static function round($val, $precision = 0, $mode = PHP_ROUND_HALF_UP, $context = '') { |
|
| 2129 | 2129 | |
| 2130 | 2130 | /**å |
| 2131 | 2131 | * Change the precision for the Sensei_Utils::round function. |
| 2132 | 2132 | * the precision given will be passed into the php round function |
| 2133 | 2133 | * @since 1.8.5 |
| 2134 | 2134 | */ |
| 2135 | - $precision = apply_filters( 'sensei_round_precision', $precision , $val, $context, $mode ); |
|
| 2135 | + $precision = apply_filters('sensei_round_precision', $precision, $val, $context, $mode); |
|
| 2136 | 2136 | |
| 2137 | 2137 | /** |
| 2138 | 2138 | * Change the mode for the Sensei_Utils::round function. |
@@ -2142,15 +2142,15 @@ discard block |
||
| 2142 | 2142 | * |
| 2143 | 2143 | * @since 1.8.5 |
| 2144 | 2144 | */ |
| 2145 | - $mode = apply_filters( 'sensei_round_mode', $mode , $val, $context, $precision ); |
|
| 2145 | + $mode = apply_filters('sensei_round_mode', $mode, $val, $context, $precision); |
|
| 2146 | 2146 | |
| 2147 | - if ( version_compare(PHP_VERSION, '5.3.0') >= 0 ) { |
|
| 2147 | + if (version_compare(PHP_VERSION, '5.3.0') >= 0) { |
|
| 2148 | 2148 | |
| 2149 | - return round( $val, $precision, $mode ); |
|
| 2149 | + return round($val, $precision, $mode); |
|
| 2150 | 2150 | |
| 2151 | - }else{ |
|
| 2151 | + } else { |
|
| 2152 | 2152 | |
| 2153 | - return round( $val, $precision ); |
|
| 2153 | + return round($val, $precision); |
|
| 2154 | 2154 | |
| 2155 | 2155 | } |
| 2156 | 2156 | |
@@ -2162,15 +2162,15 @@ discard block |
||
| 2162 | 2162 | * @since 1.9.0 |
| 2163 | 2163 | * @return string $url |
| 2164 | 2164 | */ |
| 2165 | - public static function get_current_url(){ |
|
| 2165 | + public static function get_current_url() { |
|
| 2166 | 2166 | |
| 2167 | 2167 | global $wp; |
| 2168 | - $current_url = trailingslashit( home_url( $wp->request ) ); |
|
| 2169 | - if ( isset( $_GET ) ) { |
|
| 2168 | + $current_url = trailingslashit(home_url($wp->request)); |
|
| 2169 | + if (isset($_GET)) { |
|
| 2170 | 2170 | |
| 2171 | - foreach ($_GET as $param => $val ) { |
|
| 2171 | + foreach ($_GET as $param => $val) { |
|
| 2172 | 2172 | |
| 2173 | - $current_url = add_query_arg( $param, $val , $current_url ); |
|
| 2173 | + $current_url = add_query_arg($param, $val, $current_url); |
|
| 2174 | 2174 | |
| 2175 | 2175 | } |
| 2176 | 2176 | } |
@@ -2200,27 +2200,27 @@ discard block |
||
| 2200 | 2200 | * @param array $array_b |
| 2201 | 2201 | * @return array $merged_array |
| 2202 | 2202 | */ |
| 2203 | - public static function array_zip_merge( $array_a, $array_b ){ |
|
| 2203 | + public static function array_zip_merge($array_a, $array_b) { |
|
| 2204 | 2204 | |
| 2205 | - if( ! isset( $array_a[0] ) || ! isset( $array_b[0] ) ){ |
|
| 2205 | + if ( ! isset($array_a[0]) || ! isset($array_b[0])) { |
|
| 2206 | 2206 | trigger_error('array_zip_merge requires both arrays to be indexed arrays '); |
| 2207 | 2207 | } |
| 2208 | 2208 | |
| 2209 | 2209 | $merged_array = array(); |
| 2210 | - $total_elements = count( $array_a ) + count( $array_b ); |
|
| 2210 | + $total_elements = count($array_a) + count($array_b); |
|
| 2211 | 2211 | |
| 2212 | 2212 | // Zip arrays |
| 2213 | - for ( $i = 0; $i < $total_elements; $i++) { |
|
| 2213 | + for ($i = 0; $i < $total_elements; $i++) { |
|
| 2214 | 2214 | |
| 2215 | 2215 | // if has an element at current index push a on top |
| 2216 | - if( isset( $array_a[ $i ] ) ){ |
|
| 2217 | - $merged_array[] = $array_a[ $i ] ; |
|
| 2216 | + if (isset($array_a[$i])) { |
|
| 2217 | + $merged_array[] = $array_a[$i]; |
|
| 2218 | 2218 | } |
| 2219 | 2219 | |
| 2220 | 2220 | // next if $array_b has an element at current index push a on top of the element |
| 2221 | 2221 | // from a if there was one, if not the element before that. |
| 2222 | - if( isset( $array_b[ $i ] ) ){ |
|
| 2223 | - $merged_array[] = $array_b[ $i ] ; |
|
| 2222 | + if (isset($array_b[$i])) { |
|
| 2223 | + $merged_array[] = $array_b[$i]; |
|
| 2224 | 2224 | } |
| 2225 | 2225 | |
| 2226 | 2226 | } |
@@ -2235,4 +2235,4 @@ discard block |
||
| 2235 | 2235 | * @ignore only for backward compatibility |
| 2236 | 2236 | * @since 1.9.0 |
| 2237 | 2237 | */ |
| 2238 | -class WooThemes_Sensei_Utils extends Sensei_Utils{} |
|
| 2239 | 2238 | \ No newline at end of file |
| 2239 | +class WooThemes_Sensei_Utils extends Sensei_Utils {} |
|
| 2240 | 2240 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Admin Analysis Course Data Table in Sensei. |
@@ -20,27 +20,27 @@ discard block |
||
| 20 | 20 | * Constructor |
| 21 | 21 | * @since 1.2.0 |
| 22 | 22 | */ |
| 23 | - public function __construct ( $course_id = 0, $user_id = 0 ) { |
|
| 24 | - $this->course_id = intval( $course_id ); |
|
| 25 | - $this->user_id = intval( $user_id ); |
|
| 23 | + public function __construct($course_id = 0, $user_id = 0) { |
|
| 24 | + $this->course_id = intval($course_id); |
|
| 25 | + $this->user_id = intval($user_id); |
|
| 26 | 26 | |
| 27 | - if( isset( $_GET['view'] ) && in_array( $_GET['view'], array( 'user', 'lesson' ) ) ) { |
|
| 27 | + if (isset($_GET['view']) && in_array($_GET['view'], array('user', 'lesson'))) { |
|
| 28 | 28 | $this->view = $_GET['view']; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | // Viewing a single Learner always sets the view to Lessons |
| 32 | - if( $this->user_id ) { |
|
| 32 | + if ($this->user_id) { |
|
| 33 | 33 | $this->view = 'lesson'; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // Load Parent token into constructor |
| 37 | - parent::__construct( 'analysis_course' ); |
|
| 37 | + parent::__construct('analysis_course'); |
|
| 38 | 38 | |
| 39 | 39 | // Actions |
| 40 | - add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) ); |
|
| 41 | - add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) ); |
|
| 40 | + add_action('sensei_before_list_table', array($this, 'data_table_header')); |
|
| 41 | + add_action('sensei_after_list_table', array($this, 'data_table_footer')); |
|
| 42 | 42 | |
| 43 | - add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) ); |
|
| 43 | + add_filter('sensei_list_table_search_button_text', array($this, 'search_button')); |
|
| 44 | 44 | |
| 45 | 45 | } // End __construct() |
| 46 | 46 | |
@@ -51,45 +51,45 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | function get_columns() { |
| 53 | 53 | |
| 54 | - switch( $this->view ) { |
|
| 54 | + switch ($this->view) { |
|
| 55 | 55 | case 'user' : |
| 56 | 56 | $columns = array( |
| 57 | - 'title' => __( 'Learner', 'woothemes-sensei' ), |
|
| 58 | - 'started' => __( 'Date Started', 'woothemes-sensei' ), |
|
| 59 | - 'completed' => __( 'Date Completed', 'woothemes-sensei' ), |
|
| 60 | - 'user_status' => __( 'Status', 'woothemes-sensei' ), |
|
| 61 | - 'percent' => __( 'Percent Complete', 'woothemes-sensei' ), |
|
| 57 | + 'title' => __('Learner', 'woothemes-sensei'), |
|
| 58 | + 'started' => __('Date Started', 'woothemes-sensei'), |
|
| 59 | + 'completed' => __('Date Completed', 'woothemes-sensei'), |
|
| 60 | + 'user_status' => __('Status', 'woothemes-sensei'), |
|
| 61 | + 'percent' => __('Percent Complete', 'woothemes-sensei'), |
|
| 62 | 62 | ); |
| 63 | 63 | break; |
| 64 | 64 | |
| 65 | 65 | case 'lesson' : |
| 66 | 66 | default: |
| 67 | - if ( $this->user_id ) { |
|
| 67 | + if ($this->user_id) { |
|
| 68 | 68 | |
| 69 | 69 | $columns = array( |
| 70 | - 'title' => __( 'Lesson', 'woothemes-sensei' ), |
|
| 71 | - 'started' => __( 'Date Started', 'woothemes-sensei' ), |
|
| 72 | - 'completed' => __( 'Date Completed', 'woothemes-sensei' ), |
|
| 73 | - 'user_status' => __( 'Status', 'woothemes-sensei' ), |
|
| 74 | - 'grade' => __( 'Grade', 'woothemes-sensei' ), |
|
| 70 | + 'title' => __('Lesson', 'woothemes-sensei'), |
|
| 71 | + 'started' => __('Date Started', 'woothemes-sensei'), |
|
| 72 | + 'completed' => __('Date Completed', 'woothemes-sensei'), |
|
| 73 | + 'user_status' => __('Status', 'woothemes-sensei'), |
|
| 74 | + 'grade' => __('Grade', 'woothemes-sensei'), |
|
| 75 | 75 | ); |
| 76 | 76 | |
| 77 | 77 | } else { |
| 78 | 78 | |
| 79 | 79 | $columns = array( |
| 80 | - 'title' => __( 'Lesson', 'woothemes-sensei' ), |
|
| 81 | - 'num_learners' => __( 'Learners', 'woothemes-sensei' ), |
|
| 82 | - 'completions' => __( 'Completed', 'woothemes-sensei' ), |
|
| 83 | - 'average_grade' => __( 'Average Grade', 'woothemes-sensei' ), |
|
| 80 | + 'title' => __('Lesson', 'woothemes-sensei'), |
|
| 81 | + 'num_learners' => __('Learners', 'woothemes-sensei'), |
|
| 82 | + 'completions' => __('Completed', 'woothemes-sensei'), |
|
| 83 | + 'average_grade' => __('Average Grade', 'woothemes-sensei'), |
|
| 84 | 84 | ); |
| 85 | 85 | |
| 86 | 86 | } |
| 87 | 87 | break; |
| 88 | 88 | } |
| 89 | 89 | // Backwards compatible |
| 90 | - $columns = apply_filters( 'sensei_analysis_course_' . $this->view . '_columns', $columns, $this ); |
|
| 90 | + $columns = apply_filters('sensei_analysis_course_'.$this->view.'_columns', $columns, $this); |
|
| 91 | 91 | // Moving forward, single filter with args |
| 92 | - $columns = apply_filters( 'sensei_analysis_course_columns', $columns, $this ); |
|
| 92 | + $columns = apply_filters('sensei_analysis_course_columns', $columns, $this); |
|
| 93 | 93 | return $columns; |
| 94 | 94 | } |
| 95 | 95 | |
@@ -100,46 +100,46 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | function get_sortable_columns() { |
| 102 | 102 | |
| 103 | - switch( $this->view ) { |
|
| 103 | + switch ($this->view) { |
|
| 104 | 104 | case 'user' : |
| 105 | 105 | $columns = array( |
| 106 | - 'title' => array( 'title', false ), |
|
| 107 | - 'started' => array( 'started', false ), |
|
| 108 | - 'completed' => array( 'completed', false ), |
|
| 109 | - 'user_status' => array( 'user_status', false ), |
|
| 106 | + 'title' => array('title', false), |
|
| 107 | + 'started' => array('started', false), |
|
| 108 | + 'completed' => array('completed', false), |
|
| 109 | + 'user_status' => array('user_status', false), |
|
| 110 | 110 | // 'grade' => array( 'grade', false ), |
| 111 | - 'percent' => array( 'percent', false ) |
|
| 111 | + 'percent' => array('percent', false) |
|
| 112 | 112 | ); |
| 113 | 113 | break; |
| 114 | 114 | |
| 115 | 115 | case 'lesson' : |
| 116 | 116 | default: |
| 117 | - if ( $this->user_id ) { |
|
| 117 | + if ($this->user_id) { |
|
| 118 | 118 | |
| 119 | 119 | $columns = array( |
| 120 | - 'title' => array( 'title', false ), |
|
| 121 | - 'started' => array( 'started', false ), |
|
| 122 | - 'completed' => array( 'completed', false ), |
|
| 123 | - 'user_status' => array( 'user_status', false ), |
|
| 124 | - 'grade' => array( 'grade', false ), |
|
| 120 | + 'title' => array('title', false), |
|
| 121 | + 'started' => array('started', false), |
|
| 122 | + 'completed' => array('completed', false), |
|
| 123 | + 'user_status' => array('user_status', false), |
|
| 124 | + 'grade' => array('grade', false), |
|
| 125 | 125 | ); |
| 126 | 126 | |
| 127 | 127 | } else { |
| 128 | 128 | |
| 129 | 129 | $columns = array( |
| 130 | - 'title' => array( 'title', false ), |
|
| 131 | - 'num_learners' => array( 'num_learners', false ), |
|
| 132 | - 'completions' => array( 'completions', false ), |
|
| 133 | - 'average_grade' => array( 'average_grade', false ) |
|
| 130 | + 'title' => array('title', false), |
|
| 131 | + 'num_learners' => array('num_learners', false), |
|
| 132 | + 'completions' => array('completions', false), |
|
| 133 | + 'average_grade' => array('average_grade', false) |
|
| 134 | 134 | ); |
| 135 | 135 | |
| 136 | 136 | } |
| 137 | 137 | break; |
| 138 | 138 | } |
| 139 | 139 | // Backwards compatible |
| 140 | - $columns = apply_filters( 'sensei_analysis_course_' . $this->view . '_columns_sortable', $columns, $this ); |
|
| 140 | + $columns = apply_filters('sensei_analysis_course_'.$this->view.'_columns_sortable', $columns, $this); |
|
| 141 | 141 | // Moving forward, single filter with args |
| 142 | - $columns = apply_filters( 'sensei_analysis_course_columns_sortable', $columns, $this ); |
|
| 142 | + $columns = apply_filters('sensei_analysis_course_columns_sortable', $columns, $this); |
|
| 143 | 143 | return $columns; |
| 144 | 144 | } |
| 145 | 145 | |
@@ -153,32 +153,32 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | // Handle orderby (needs work) |
| 155 | 155 | $orderby = ''; |
| 156 | - if ( !empty( $_GET['orderby'] ) ) { |
|
| 157 | - if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) { |
|
| 158 | - $orderby = esc_html( $_GET['orderby'] ); |
|
| 156 | + if ( ! empty($_GET['orderby'])) { |
|
| 157 | + if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) { |
|
| 158 | + $orderby = esc_html($_GET['orderby']); |
|
| 159 | 159 | } // End If Statement |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | // Handle order |
| 163 | 163 | $order = 'ASC'; |
| 164 | - if ( !empty( $_GET['order'] ) ) { |
|
| 165 | - $order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC'; |
|
| 164 | + if ( ! empty($_GET['order'])) { |
|
| 165 | + $order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC'; |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | // Handle search, need 4.1 version of WP to be able to restrict statuses to known post_ids |
| 169 | 169 | $search = false; |
| 170 | - if ( !empty( $_GET['s'] ) ) { |
|
| 171 | - $search = esc_html( $_GET['s'] ); |
|
| 170 | + if ( ! empty($_GET['s'])) { |
|
| 171 | + $search = esc_html($_GET['s']); |
|
| 172 | 172 | } // End If Statement |
| 173 | 173 | $this->search = $search; |
| 174 | 174 | |
| 175 | - $per_page = $this->get_items_per_page( 'sensei_comments_per_page' ); |
|
| 176 | - $per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' ); |
|
| 175 | + $per_page = $this->get_items_per_page('sensei_comments_per_page'); |
|
| 176 | + $per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments'); |
|
| 177 | 177 | |
| 178 | 178 | $paged = $this->get_pagenum(); |
| 179 | 179 | $offset = 0; |
| 180 | - if ( !empty($paged) ) { |
|
| 181 | - $offset = $per_page * ( $paged - 1 ); |
|
| 180 | + if ( ! empty($paged)) { |
|
| 181 | + $offset = $per_page * ($paged - 1); |
|
| 182 | 182 | } // End If Statement |
| 183 | 183 | |
| 184 | 184 | $args = array( |
@@ -187,28 +187,28 @@ discard block |
||
| 187 | 187 | 'orderby' => $orderby, |
| 188 | 188 | 'order' => $order, |
| 189 | 189 | ); |
| 190 | - if ( $this->search ) { |
|
| 190 | + if ($this->search) { |
|
| 191 | 191 | $args['search'] = $this->search; |
| 192 | 192 | } // End If Statement |
| 193 | 193 | |
| 194 | - switch( $this->view ) { |
|
| 194 | + switch ($this->view) { |
|
| 195 | 195 | case 'user' : |
| 196 | - $this->items = $this->get_course_statuses( $args ); |
|
| 196 | + $this->items = $this->get_course_statuses($args); |
|
| 197 | 197 | break; |
| 198 | 198 | |
| 199 | 199 | case 'lesson': |
| 200 | 200 | default: |
| 201 | - $this->items = $this->get_lessons( $args ); |
|
| 201 | + $this->items = $this->get_lessons($args); |
|
| 202 | 202 | break; |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | $total_items = $this->total_items; |
| 206 | - $total_pages = ceil( $total_items / $per_page ); |
|
| 207 | - $this->set_pagination_args( array( |
|
| 206 | + $total_pages = ceil($total_items / $per_page); |
|
| 207 | + $this->set_pagination_args(array( |
|
| 208 | 208 | 'total_items' => $total_items, |
| 209 | 209 | 'total_pages' => $total_pages, |
| 210 | 210 | 'per_page' => $per_page |
| 211 | - ) ); |
|
| 211 | + )); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | /** |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | * @since 1.7.0 |
| 217 | 217 | * @return data |
| 218 | 218 | */ |
| 219 | - public function generate_report( $report ) { |
|
| 219 | + public function generate_report($report) { |
|
| 220 | 220 | |
| 221 | 221 | $data = array(); |
| 222 | 222 | |
@@ -224,22 +224,22 @@ discard block |
||
| 224 | 224 | |
| 225 | 225 | // Handle orderby |
| 226 | 226 | $orderby = ''; |
| 227 | - if ( !empty( $_GET['orderby'] ) ) { |
|
| 228 | - if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) { |
|
| 229 | - $orderby = esc_html( $_GET['orderby'] ); |
|
| 227 | + if ( ! empty($_GET['orderby'])) { |
|
| 228 | + if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) { |
|
| 229 | + $orderby = esc_html($_GET['orderby']); |
|
| 230 | 230 | } // End If Statement |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | // Handle order |
| 234 | 234 | $order = 'ASC'; |
| 235 | - if ( !empty( $_GET['order'] ) ) { |
|
| 236 | - $order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC'; |
|
| 235 | + if ( ! empty($_GET['order'])) { |
|
| 236 | + $order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC'; |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | // Handle search |
| 240 | 240 | $search = false; |
| 241 | - if ( !empty( $_GET['s'] ) ) { |
|
| 242 | - $search = esc_html( $_GET['s'] ); |
|
| 241 | + if ( ! empty($_GET['s'])) { |
|
| 242 | + $search = esc_html($_GET['s']); |
|
| 243 | 243 | } // End If Statement |
| 244 | 244 | $this->search = $search; |
| 245 | 245 | |
@@ -247,32 +247,32 @@ discard block |
||
| 247 | 247 | 'orderby' => $orderby, |
| 248 | 248 | 'order' => $order, |
| 249 | 249 | ); |
| 250 | - if ( $this->search ) { |
|
| 250 | + if ($this->search) { |
|
| 251 | 251 | $args['search'] = $this->search; |
| 252 | 252 | } // End If Statement |
| 253 | 253 | |
| 254 | 254 | // Start the csv with the column headings |
| 255 | 255 | $column_headers = array(); |
| 256 | 256 | $columns = $this->get_columns(); |
| 257 | - foreach( $columns AS $key => $title ) { |
|
| 257 | + foreach ($columns AS $key => $title) { |
|
| 258 | 258 | $column_headers[] = $title; |
| 259 | 259 | } |
| 260 | 260 | $data[] = $column_headers; |
| 261 | 261 | |
| 262 | - switch( $this->view ) { |
|
| 262 | + switch ($this->view) { |
|
| 263 | 263 | case 'user' : |
| 264 | - $this->items = $this->get_course_statuses( $args ); |
|
| 264 | + $this->items = $this->get_course_statuses($args); |
|
| 265 | 265 | break; |
| 266 | 266 | |
| 267 | 267 | case 'lesson': |
| 268 | 268 | default: |
| 269 | - $this->items = $this->get_lessons( $args ); |
|
| 269 | + $this->items = $this->get_lessons($args); |
|
| 270 | 270 | break; |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | // Process each row |
| 274 | - foreach( $this->items AS $item) { |
|
| 275 | - $data[] = $this->get_row_data( $item ); |
|
| 274 | + foreach ($this->items AS $item) { |
|
| 275 | + $data[] = $this->get_row_data($item); |
|
| 276 | 276 | } |
| 277 | 277 | |
| 278 | 278 | return $data; |
@@ -284,37 +284,37 @@ discard block |
||
| 284 | 284 | * @since 1.7.0 |
| 285 | 285 | * @param object $item The current item |
| 286 | 286 | */ |
| 287 | - protected function get_row_data( $item ) { |
|
| 287 | + protected function get_row_data($item) { |
|
| 288 | 288 | |
| 289 | - switch( $this->view ) { |
|
| 289 | + switch ($this->view) { |
|
| 290 | 290 | case 'user' : |
| 291 | - $user_start_date = get_comment_meta( $item->comment_ID, 'start', true ); |
|
| 291 | + $user_start_date = get_comment_meta($item->comment_ID, 'start', true); |
|
| 292 | 292 | $user_end_date = $item->comment_date; |
| 293 | 293 | |
| 294 | - if( 'complete' == $item->comment_approved ) { |
|
| 294 | + if ('complete' == $item->comment_approved) { |
|
| 295 | 295 | |
| 296 | - $status = __( 'Completed', 'woothemes-sensei' ); |
|
| 296 | + $status = __('Completed', 'woothemes-sensei'); |
|
| 297 | 297 | $status_class = 'graded'; |
| 298 | 298 | |
| 299 | 299 | } else { |
| 300 | 300 | |
| 301 | - $status = __( 'In Progress', 'woothemes-sensei' ); |
|
| 301 | + $status = __('In Progress', 'woothemes-sensei'); |
|
| 302 | 302 | $status_class = 'in-progress'; |
| 303 | 303 | $user_end_date = ''; |
| 304 | 304 | |
| 305 | 305 | } |
| 306 | - $course_percent = get_comment_meta( $item->comment_ID, 'percent', true ); |
|
| 306 | + $course_percent = get_comment_meta($item->comment_ID, 'percent', true); |
|
| 307 | 307 | |
| 308 | 308 | // Output users data |
| 309 | - $user_name = Sensei_Learner::get_full_name( $item->user_id ); |
|
| 309 | + $user_name = Sensei_Learner::get_full_name($item->user_id); |
|
| 310 | 310 | |
| 311 | - if ( !$this->csv_output ) { |
|
| 311 | + if ( ! $this->csv_output) { |
|
| 312 | 312 | |
| 313 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->user_id, 'course_id' => $this->course_id ), admin_url( 'admin.php' ) ); |
|
| 313 | + $url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $item->user_id, 'course_id' => $this->course_id), admin_url('admin.php')); |
|
| 314 | 314 | |
| 315 | - $user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $user_name . '</a></strong>'; |
|
| 316 | - $status = sprintf( '<span class="%s">%s</span>', $status_class, $status ); |
|
| 317 | - if ( is_numeric($course_percent) ) { |
|
| 315 | + $user_name = '<strong><a class="row-title" href="'.esc_url($url).'">'.$user_name.'</a></strong>'; |
|
| 316 | + $status = sprintf('<span class="%s">%s</span>', $status_class, $status); |
|
| 317 | + if (is_numeric($course_percent)) { |
|
| 318 | 318 | |
| 319 | 319 | $course_percent .= '%'; |
| 320 | 320 | |
@@ -322,19 +322,19 @@ discard block |
||
| 322 | 322 | |
| 323 | 323 | } // End If Statement |
| 324 | 324 | |
| 325 | - $column_data = apply_filters( 'sensei_analysis_course_column_data', array( 'title' => $user_name, |
|
| 325 | + $column_data = apply_filters('sensei_analysis_course_column_data', array('title' => $user_name, |
|
| 326 | 326 | 'started' => $user_start_date, |
| 327 | 327 | 'completed' => $user_end_date, |
| 328 | 328 | 'user_status' => $status, |
| 329 | 329 | 'percent' => $course_percent, |
| 330 | - ), $item, $this ); |
|
| 330 | + ), $item, $this); |
|
| 331 | 331 | break; |
| 332 | 332 | |
| 333 | 333 | case 'lesson': |
| 334 | 334 | default: |
| 335 | 335 | // Displaying lessons for this Course for a specific User |
| 336 | - if ( $this->user_id ) { |
|
| 337 | - $status = __( 'Not started', 'woothemes-sensei' ); |
|
| 336 | + if ($this->user_id) { |
|
| 337 | + $status = __('Not started', 'woothemes-sensei'); |
|
| 338 | 338 | $user_start_date = $user_end_date = $status_class = $grade = ''; |
| 339 | 339 | |
| 340 | 340 | $lesson_args = array( |
@@ -343,66 +343,66 @@ discard block |
||
| 343 | 343 | 'type' => 'sensei_lesson_status', |
| 344 | 344 | 'status' => 'any', |
| 345 | 345 | ); |
| 346 | - $lesson_status = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_user_lesson', $lesson_args, $item, $this->user_id ), true ); |
|
| 346 | + $lesson_status = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_user_lesson', $lesson_args, $item, $this->user_id), true); |
|
| 347 | 347 | |
| 348 | - if ( !empty($lesson_status) ) { |
|
| 349 | - $user_start_date = get_comment_meta( $lesson_status->comment_ID, 'start', true ); |
|
| 348 | + if ( ! empty($lesson_status)) { |
|
| 349 | + $user_start_date = get_comment_meta($lesson_status->comment_ID, 'start', true); |
|
| 350 | 350 | $user_end_date = $lesson_status->comment_date; |
| 351 | 351 | |
| 352 | - if( 'complete' == $lesson_status->comment_approved ) { |
|
| 353 | - $status = __( 'Completed', 'woothemes-sensei' ); |
|
| 352 | + if ('complete' == $lesson_status->comment_approved) { |
|
| 353 | + $status = __('Completed', 'woothemes-sensei'); |
|
| 354 | 354 | $status_class = 'graded'; |
| 355 | 355 | |
| 356 | - $grade = __( 'No Grade', 'woothemes-sensei' ); |
|
| 356 | + $grade = __('No Grade', 'woothemes-sensei'); |
|
| 357 | 357 | } |
| 358 | - elseif( 'graded' == $lesson_status->comment_approved ) { |
|
| 359 | - $status = __( 'Graded', 'woothemes-sensei' ); |
|
| 358 | + elseif ('graded' == $lesson_status->comment_approved) { |
|
| 359 | + $status = __('Graded', 'woothemes-sensei'); |
|
| 360 | 360 | $status_class = 'graded'; |
| 361 | 361 | |
| 362 | - $grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true); |
|
| 362 | + $grade = get_comment_meta($lesson_status->comment_ID, 'grade', true); |
|
| 363 | 363 | } |
| 364 | - elseif( 'passed' == $lesson_status->comment_approved ) { |
|
| 365 | - $status = __( 'Passed', 'woothemes-sensei' ); |
|
| 364 | + elseif ('passed' == $lesson_status->comment_approved) { |
|
| 365 | + $status = __('Passed', 'woothemes-sensei'); |
|
| 366 | 366 | $status_class = 'graded'; |
| 367 | 367 | |
| 368 | - $grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true); |
|
| 368 | + $grade = get_comment_meta($lesson_status->comment_ID, 'grade', true); |
|
| 369 | 369 | } |
| 370 | - elseif( 'failed' == $lesson_status->comment_approved ) { |
|
| 371 | - $status = __( 'Failed', 'woothemes-sensei' ); |
|
| 370 | + elseif ('failed' == $lesson_status->comment_approved) { |
|
| 371 | + $status = __('Failed', 'woothemes-sensei'); |
|
| 372 | 372 | $status_class = 'failed'; |
| 373 | 373 | |
| 374 | - $grade = get_comment_meta( $lesson_status->comment_ID, 'grade', true); |
|
| 374 | + $grade = get_comment_meta($lesson_status->comment_ID, 'grade', true); |
|
| 375 | 375 | } |
| 376 | - elseif( 'ungraded' == $lesson_status->comment_approved ) { |
|
| 377 | - $status = __( 'Ungraded', 'woothemes-sensei' ); |
|
| 376 | + elseif ('ungraded' == $lesson_status->comment_approved) { |
|
| 377 | + $status = __('Ungraded', 'woothemes-sensei'); |
|
| 378 | 378 | $status_class = 'ungraded'; |
| 379 | 379 | |
| 380 | 380 | } |
| 381 | - elseif( 'in-progress' == $lesson_status->comment_approved ) { |
|
| 382 | - $status = __( 'In Progress', 'woothemes-sensei' ); |
|
| 381 | + elseif ('in-progress' == $lesson_status->comment_approved) { |
|
| 382 | + $status = __('In Progress', 'woothemes-sensei'); |
|
| 383 | 383 | $user_end_date = ''; |
| 384 | 384 | } |
| 385 | 385 | } // END lesson_status |
| 386 | 386 | |
| 387 | 387 | // Output users data |
| 388 | - if ( $this->csv_output ) { |
|
| 389 | - $lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID ); |
|
| 388 | + if ($this->csv_output) { |
|
| 389 | + $lesson_title = apply_filters('the_title', $item->post_title, $item->ID); |
|
| 390 | 390 | } |
| 391 | 391 | else { |
| 392 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) ); |
|
| 393 | - $lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>'; |
|
| 392 | + $url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID), admin_url('admin.php')); |
|
| 393 | + $lesson_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>'; |
|
| 394 | 394 | |
| 395 | - $status = sprintf( '<span class="%s">%s</span>', $status_class, $status ); |
|
| 396 | - if ( is_numeric($grade) ) { |
|
| 395 | + $status = sprintf('<span class="%s">%s</span>', $status_class, $status); |
|
| 396 | + if (is_numeric($grade)) { |
|
| 397 | 397 | $grade .= '%'; |
| 398 | 398 | } |
| 399 | 399 | } // End If Statement |
| 400 | - $column_data = apply_filters( 'sensei_analysis_course_column_data', array( 'title' => $lesson_title, |
|
| 400 | + $column_data = apply_filters('sensei_analysis_course_column_data', array('title' => $lesson_title, |
|
| 401 | 401 | 'started' => $user_start_date, |
| 402 | 402 | 'completed' => $user_end_date, |
| 403 | 403 | 'user_status' => $status, |
| 404 | 404 | 'grade' => $grade, |
| 405 | - ), $item, $this ); |
|
| 405 | + ), $item, $this); |
|
| 406 | 406 | } |
| 407 | 407 | // Display lessons for this Course regardless of users |
| 408 | 408 | else { |
@@ -412,51 +412,51 @@ discard block |
||
| 412 | 412 | 'type' => 'sensei_lesson_status', |
| 413 | 413 | 'status' => 'any', |
| 414 | 414 | ); |
| 415 | - $lesson_students = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_learners', $lesson_args, $item ) ); |
|
| 415 | + $lesson_students = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_learners', $lesson_args, $item)); |
|
| 416 | 416 | |
| 417 | 417 | // Get Course Completions |
| 418 | 418 | $lesson_args = array( |
| 419 | 419 | 'post_id' => $item->ID, |
| 420 | 420 | 'type' => 'sensei_lesson_status', |
| 421 | - 'status' => array( 'complete', 'graded', 'passed', 'failed' ), |
|
| 421 | + 'status' => array('complete', 'graded', 'passed', 'failed'), |
|
| 422 | 422 | 'count' => true, |
| 423 | 423 | ); |
| 424 | - $lesson_completions = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_completions', $lesson_args, $item ) ); |
|
| 424 | + $lesson_completions = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_completions', $lesson_args, $item)); |
|
| 425 | 425 | |
| 426 | 426 | $lesson_average_grade = __('n/a', 'woothemes-sensei'); |
| 427 | - if ( false != get_post_meta($item->ID, '_quiz_has_questions', true) ) { |
|
| 427 | + if (false != get_post_meta($item->ID, '_quiz_has_questions', true)) { |
|
| 428 | 428 | // Get Percent Complete |
| 429 | 429 | $grade_args = array( |
| 430 | 430 | 'post_id' => $item->ID, |
| 431 | 431 | 'type' => 'sensei_lesson_status', |
| 432 | - 'status' => array( 'graded', 'passed', 'failed' ), |
|
| 432 | + 'status' => array('graded', 'passed', 'failed'), |
|
| 433 | 433 | 'meta_key' => 'grade', |
| 434 | 434 | ); |
| 435 | - add_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 436 | - $lesson_grades = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_grades', $grade_args, $item ), true ); |
|
| 437 | - remove_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 435 | + add_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 436 | + $lesson_grades = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_grades', $grade_args, $item), true); |
|
| 437 | + remove_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 438 | 438 | |
| 439 | - $grade_count = !empty( $lesson_grades->total ) ? $lesson_grades->total : 1; |
|
| 440 | - $grade_total = !empty( $lesson_grades->meta_sum ) ? doubleval( $lesson_grades->meta_sum ) : 0; |
|
| 441 | - $lesson_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) ); |
|
| 439 | + $grade_count = ! empty($lesson_grades->total) ? $lesson_grades->total : 1; |
|
| 440 | + $grade_total = ! empty($lesson_grades->meta_sum) ? doubleval($lesson_grades->meta_sum) : 0; |
|
| 441 | + $lesson_average_grade = abs(round(doubleval($grade_total / $grade_count), 2)); |
|
| 442 | 442 | } |
| 443 | 443 | // Output lesson data |
| 444 | - if ( $this->csv_output ) { |
|
| 445 | - $lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID ); |
|
| 444 | + if ($this->csv_output) { |
|
| 445 | + $lesson_title = apply_filters('the_title', $item->post_title, $item->ID); |
|
| 446 | 446 | } |
| 447 | 447 | else { |
| 448 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) ); |
|
| 449 | - $lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>'; |
|
| 448 | + $url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID), admin_url('admin.php')); |
|
| 449 | + $lesson_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>'; |
|
| 450 | 450 | |
| 451 | - if ( is_numeric( $lesson_average_grade ) ) { |
|
| 451 | + if (is_numeric($lesson_average_grade)) { |
|
| 452 | 452 | $lesson_average_grade .= '%'; |
| 453 | 453 | } |
| 454 | 454 | } // End If Statement |
| 455 | - $column_data = apply_filters( 'sensei_analysis_course_column_data', array( 'title' => $lesson_title, |
|
| 455 | + $column_data = apply_filters('sensei_analysis_course_column_data', array('title' => $lesson_title, |
|
| 456 | 456 | 'num_learners' => $lesson_students, |
| 457 | 457 | 'completions' => $lesson_completions, |
| 458 | 458 | 'average_grade' => $lesson_average_grade, |
| 459 | - ), $item, $this ); |
|
| 459 | + ), $item, $this); |
|
| 460 | 460 | } // END if |
| 461 | 461 | break; |
| 462 | 462 | } // END switch |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | * @since 1.7.0 |
| 470 | 470 | * @return array statuses |
| 471 | 471 | */ |
| 472 | - private function get_course_statuses( $args ) { |
|
| 472 | + private function get_course_statuses($args) { |
|
| 473 | 473 | |
| 474 | 474 | $activity_args = array( |
| 475 | 475 | 'post_id' => $this->course_id, |
@@ -482,34 +482,34 @@ discard block |
||
| 482 | 482 | ); |
| 483 | 483 | |
| 484 | 484 | // Searching users on statuses requires sub-selecting the statuses by user_ids |
| 485 | - if ( $this->search ) { |
|
| 485 | + if ($this->search) { |
|
| 486 | 486 | $user_args = array( |
| 487 | - 'search' => '*' . $this->search . '*', |
|
| 487 | + 'search' => '*'.$this->search.'*', |
|
| 488 | 488 | 'fields' => 'ID', |
| 489 | 489 | ); |
| 490 | 490 | // Filter for extending |
| 491 | - $user_args = apply_filters( 'sensei_analysis_course_search_users', $user_args ); |
|
| 492 | - if ( !empty( $user_args ) ) { |
|
| 493 | - $learners_search = new WP_User_Query( $user_args ); |
|
| 491 | + $user_args = apply_filters('sensei_analysis_course_search_users', $user_args); |
|
| 492 | + if ( ! empty($user_args)) { |
|
| 493 | + $learners_search = new WP_User_Query($user_args); |
|
| 494 | 494 | // Store for reuse on counts |
| 495 | 495 | $activity_args['user_id'] = (array) $learners_search->get_results(); |
| 496 | 496 | } |
| 497 | 497 | } // End If Statement |
| 498 | 498 | |
| 499 | - $activity_args = apply_filters( 'sensei_analysis_course_filter_statuses', $activity_args ); |
|
| 499 | + $activity_args = apply_filters('sensei_analysis_course_filter_statuses', $activity_args); |
|
| 500 | 500 | |
| 501 | 501 | // WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice |
| 502 | - $this->total_items = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) ); |
|
| 502 | + $this->total_items = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0))); |
|
| 503 | 503 | |
| 504 | 504 | // Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views? |
| 505 | - if ( $this->total_items < $activity_args['offset'] ) { |
|
| 506 | - $new_paged = floor( $this->total_items / $activity_args['number'] ); |
|
| 505 | + if ($this->total_items < $activity_args['offset']) { |
|
| 506 | + $new_paged = floor($this->total_items / $activity_args['number']); |
|
| 507 | 507 | $activity_args['offset'] = $new_paged * $activity_args['number']; |
| 508 | 508 | } |
| 509 | - $statuses = Sensei_Utils::sensei_check_for_activity( $activity_args, true ); |
|
| 509 | + $statuses = Sensei_Utils::sensei_check_for_activity($activity_args, true); |
|
| 510 | 510 | // Need to always return an array, even with only 1 item |
| 511 | - if ( !is_array($statuses) ) { |
|
| 512 | - $statuses = array( $statuses ); |
|
| 511 | + if ( ! is_array($statuses)) { |
|
| 512 | + $statuses = array($statuses); |
|
| 513 | 513 | } |
| 514 | 514 | return $statuses; |
| 515 | 515 | } // End get_course_statuses() |
@@ -519,32 +519,32 @@ discard block |
||
| 519 | 519 | * @since 1.7.0 |
| 520 | 520 | * @return array statuses |
| 521 | 521 | */ |
| 522 | - private function get_lessons( $args ) { |
|
| 522 | + private function get_lessons($args) { |
|
| 523 | 523 | |
| 524 | - $lessons_args = array( 'post_type' => 'lesson', |
|
| 524 | + $lessons_args = array('post_type' => 'lesson', |
|
| 525 | 525 | 'posts_per_page' => $args['number'], |
| 526 | 526 | 'offset' => $args['offset'], |
| 527 | - 'meta_key' => '_order_' . $this->course_id, |
|
| 527 | + 'meta_key' => '_order_'.$this->course_id, |
|
| 528 | 528 | // 'orderby' => $args['orderby'], |
| 529 | 529 | 'order' => $args['order'], |
| 530 | 530 | 'meta_query' => array( |
| 531 | 531 | array( |
| 532 | 532 | 'key' => '_lesson_course', |
| 533 | - 'value' => intval( $this->course_id ), |
|
| 533 | + 'value' => intval($this->course_id), |
|
| 534 | 534 | ), |
| 535 | 535 | ), |
| 536 | 536 | 'post_status' => array('publish', 'private'), |
| 537 | 537 | 'suppress_filters' => 0 |
| 538 | 538 | ); |
| 539 | - if ( $this->search ) { |
|
| 539 | + if ($this->search) { |
|
| 540 | 540 | $lessons_args['s'] = $this->search; |
| 541 | 541 | } |
| 542 | - if ( $this->csv_output ) { |
|
| 542 | + if ($this->csv_output) { |
|
| 543 | 543 | $lessons_args['posts_per_page'] = '-1'; |
| 544 | 544 | } |
| 545 | 545 | |
| 546 | 546 | // Using WP_Query as get_posts() doesn't support 'found_posts' |
| 547 | - $lessons_query = new WP_Query( apply_filters( 'sensei_analysis_course_filter_lessons', $lessons_args ) ); |
|
| 547 | + $lessons_query = new WP_Query(apply_filters('sensei_analysis_course_filter_lessons', $lessons_args)); |
|
| 548 | 548 | $this->total_items = $lessons_query->found_posts; |
| 549 | 549 | return $lessons_query->posts; |
| 550 | 550 | } // End get_lessons() |
@@ -556,17 +556,17 @@ discard block |
||
| 556 | 556 | * @return void |
| 557 | 557 | */ |
| 558 | 558 | public function no_items() { |
| 559 | - switch( $this->view ) { |
|
| 559 | + switch ($this->view) { |
|
| 560 | 560 | case 'user' : |
| 561 | - $text = __( 'No learners found.', 'woothemes-sensei' ); |
|
| 561 | + $text = __('No learners found.', 'woothemes-sensei'); |
|
| 562 | 562 | break; |
| 563 | 563 | |
| 564 | 564 | case 'lesson': |
| 565 | 565 | default: |
| 566 | - $text = __( 'No lessons found.', 'woothemes-sensei' ); |
|
| 566 | + $text = __('No lessons found.', 'woothemes-sensei'); |
|
| 567 | 567 | break; |
| 568 | 568 | } |
| 569 | - echo apply_filters( 'sensei_analysis_course_no_items_text', $text ); |
|
| 569 | + echo apply_filters('sensei_analysis_course_no_items_text', $text); |
|
| 570 | 570 | } // End no_items() |
| 571 | 571 | |
| 572 | 572 | /** |
@@ -575,25 +575,25 @@ discard block |
||
| 575 | 575 | * @return void |
| 576 | 576 | */ |
| 577 | 577 | public function data_table_header() { |
| 578 | - if ( $this->user_id ) { |
|
| 579 | - $learners_text = __( 'Other Learners taking this Course', 'woothemes-sensei' ); |
|
| 578 | + if ($this->user_id) { |
|
| 579 | + $learners_text = __('Other Learners taking this Course', 'woothemes-sensei'); |
|
| 580 | 580 | } |
| 581 | 581 | else { |
| 582 | - $learners_text = __( 'Learners taking this Course', 'woothemes-sensei' ); |
|
| 582 | + $learners_text = __('Learners taking this Course', 'woothemes-sensei'); |
|
| 583 | 583 | } |
| 584 | - $lessons_text = __( 'Lessons in this Course', 'woothemes-sensei' ); |
|
| 584 | + $lessons_text = __('Lessons in this Course', 'woothemes-sensei'); |
|
| 585 | 585 | |
| 586 | 586 | $url_args = array( |
| 587 | 587 | 'page' => $this->page_slug, |
| 588 | 588 | 'course_id' => $this->course_id, |
| 589 | 589 | ); |
| 590 | - $learners_url = esc_url( add_query_arg( array_merge( $url_args, array( 'view' => 'user' ) ), admin_url( 'admin.php' ) ) ); |
|
| 591 | - $lessons_url = esc_url( add_query_arg( array_merge( $url_args, array( 'view' => 'lesson' ) ), admin_url( 'admin.php' ) ) ); |
|
| 590 | + $learners_url = esc_url(add_query_arg(array_merge($url_args, array('view' => 'user')), admin_url('admin.php'))); |
|
| 591 | + $lessons_url = esc_url(add_query_arg(array_merge($url_args, array('view' => 'lesson')), admin_url('admin.php'))); |
|
| 592 | 592 | |
| 593 | 593 | $learners_class = $lessons_class = ''; |
| 594 | 594 | |
| 595 | 595 | $menu = array(); |
| 596 | - switch( $this->view ) { |
|
| 596 | + switch ($this->view) { |
|
| 597 | 597 | case 'user' : |
| 598 | 598 | $learners_class = 'current'; |
| 599 | 599 | break; |
@@ -603,17 +603,17 @@ discard block |
||
| 603 | 603 | $lessons_class = 'current'; |
| 604 | 604 | break; |
| 605 | 605 | } |
| 606 | - $menu['lesson'] = sprintf( '<a href="%s" class="%s">%s</a>', $lessons_url, $lessons_class, $lessons_text ); |
|
| 607 | - $menu['user'] = sprintf( '<a href="%s" class="%s">%s</a>', $learners_url, $learners_class, $learners_text ); |
|
| 608 | - |
|
| 609 | - $menu = apply_filters( 'sensei_analysis_course_sub_menu', $menu ); |
|
| 610 | - if ( !empty($menu) ) { |
|
| 611 | - echo '<ul class="subsubsub">' . "\n"; |
|
| 612 | - foreach ( $menu as $class => $item ) { |
|
| 613 | - $menu[ $class ] = "\t<li class='$class'>$item"; |
|
| 606 | + $menu['lesson'] = sprintf('<a href="%s" class="%s">%s</a>', $lessons_url, $lessons_class, $lessons_text); |
|
| 607 | + $menu['user'] = sprintf('<a href="%s" class="%s">%s</a>', $learners_url, $learners_class, $learners_text); |
|
| 608 | + |
|
| 609 | + $menu = apply_filters('sensei_analysis_course_sub_menu', $menu); |
|
| 610 | + if ( ! empty($menu)) { |
|
| 611 | + echo '<ul class="subsubsub">'."\n"; |
|
| 612 | + foreach ($menu as $class => $item) { |
|
| 613 | + $menu[$class] = "\t<li class='$class'>$item"; |
|
| 614 | 614 | } |
| 615 | - echo implode( " |</li>\n", $menu ) . "</li>\n"; |
|
| 616 | - echo '</ul>' . "\n"; |
|
| 615 | + echo implode(" |</li>\n", $menu)."</li>\n"; |
|
| 616 | + echo '</ul>'."\n"; |
|
| 617 | 617 | } |
| 618 | 618 | } // End data_table_header() |
| 619 | 619 | |
@@ -624,19 +624,19 @@ discard block |
||
| 624 | 624 | */ |
| 625 | 625 | public function data_table_footer() { |
| 626 | 626 | |
| 627 | - $course = get_post( $this->course_id ); |
|
| 628 | - $report = sanitize_title( $course->post_title ) . '-' . $this->view . 's-overview'; |
|
| 629 | - if ( $this->user_id ) { |
|
| 630 | - $user_name = Sensei_Learner::get_full_name( $this->user_id ); |
|
| 631 | - $report = sanitize_title( $user_name ) . '-' . $report; |
|
| 627 | + $course = get_post($this->course_id); |
|
| 628 | + $report = sanitize_title($course->post_title).'-'.$this->view.'s-overview'; |
|
| 629 | + if ($this->user_id) { |
|
| 630 | + $user_name = Sensei_Learner::get_full_name($this->user_id); |
|
| 631 | + $report = sanitize_title($user_name).'-'.$report; |
|
| 632 | 632 | } |
| 633 | 633 | |
| 634 | - $url_args = array( 'page' => $this->page_slug, 'course_id' => $this->course_id, 'view' => $this->view, 'sensei_report_download' => $report ); |
|
| 635 | - if ( $this->user_id ) { |
|
| 634 | + $url_args = array('page' => $this->page_slug, 'course_id' => $this->course_id, 'view' => $this->view, 'sensei_report_download' => $report); |
|
| 635 | + if ($this->user_id) { |
|
| 636 | 636 | $url_args['user_id'] = $this->user_id; |
| 637 | 637 | } |
| 638 | - $url = add_query_arg( $url_args, admin_url( 'admin.php' ) ); |
|
| 639 | - echo '<a class="button button-primary" href="' . esc_url( wp_nonce_url( $url, 'sensei_csv_download-' . $report, '_sdl_nonce' ) ) . '">' . __( 'Export all rows (CSV)', 'woothemes-sensei' ) . '</a>'; |
|
| 638 | + $url = add_query_arg($url_args, admin_url('admin.php')); |
|
| 639 | + echo '<a class="button button-primary" href="'.esc_url(wp_nonce_url($url, 'sensei_csv_download-'.$report, '_sdl_nonce')).'">'.__('Export all rows (CSV)', 'woothemes-sensei').'</a>'; |
|
| 640 | 640 | } // End data_table_footer() |
| 641 | 641 | |
| 642 | 642 | /** |
@@ -644,15 +644,15 @@ discard block |
||
| 644 | 644 | * @since 1.7.0 |
| 645 | 645 | * @return string $text |
| 646 | 646 | */ |
| 647 | - public function search_button( $text = '' ) { |
|
| 648 | - switch( $this->view ) { |
|
| 647 | + public function search_button($text = '') { |
|
| 648 | + switch ($this->view) { |
|
| 649 | 649 | case 'user': |
| 650 | - $text = __( 'Search Learners', 'woothemes-sensei' ); |
|
| 650 | + $text = __('Search Learners', 'woothemes-sensei'); |
|
| 651 | 651 | break; |
| 652 | 652 | |
| 653 | 653 | case 'lesson': |
| 654 | 654 | default: |
| 655 | - $text = __( 'Search Lessons', 'woothemes-sensei' ); |
|
| 655 | + $text = __('Search Lessons', 'woothemes-sensei'); |
|
| 656 | 656 | break; |
| 657 | 657 | } // End Switch Statement |
| 658 | 658 | |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Sensei Learners Overview List Table Class |
@@ -22,28 +22,28 @@ discard block |
||
| 22 | 22 | * Constructor |
| 23 | 23 | * @since 1.6.0 |
| 24 | 24 | */ |
| 25 | - public function __construct ( $course_id = 0, $lesson_id = 0 ) { |
|
| 26 | - $this->course_id = intval( $course_id ); |
|
| 27 | - $this->lesson_id = intval( $lesson_id ); |
|
| 25 | + public function __construct($course_id = 0, $lesson_id = 0) { |
|
| 26 | + $this->course_id = intval($course_id); |
|
| 27 | + $this->lesson_id = intval($lesson_id); |
|
| 28 | 28 | |
| 29 | - if( isset( $_GET['view'] ) && in_array( $_GET['view'], array( 'courses', 'lessons', 'learners' ) ) ) { |
|
| 29 | + if (isset($_GET['view']) && in_array($_GET['view'], array('courses', 'lessons', 'learners'))) { |
|
| 30 | 30 | $this->view = $_GET['view']; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | // Viewing a single lesson always sets the view to Learners |
| 34 | - if( $this->lesson_id ) { |
|
| 34 | + if ($this->lesson_id) { |
|
| 35 | 35 | $this->view = 'learners'; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | // Load Parent token into constructor |
| 39 | - parent::__construct( 'learners_main' ); |
|
| 39 | + parent::__construct('learners_main'); |
|
| 40 | 40 | |
| 41 | 41 | // Actions |
| 42 | - add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) ); |
|
| 43 | - add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) ); |
|
| 44 | - add_action( 'sensei_learners_extra', array( $this, 'add_learners_box' ) ); |
|
| 42 | + add_action('sensei_before_list_table', array($this, 'data_table_header')); |
|
| 43 | + add_action('sensei_after_list_table', array($this, 'data_table_footer')); |
|
| 44 | + add_action('sensei_learners_extra', array($this, 'add_learners_box')); |
|
| 45 | 45 | |
| 46 | - add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) ); |
|
| 46 | + add_filter('sensei_list_table_search_button_text', array($this, 'search_button')); |
|
| 47 | 47 | } // End __construct() |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -53,38 +53,38 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | function get_columns() { |
| 55 | 55 | $columns = array(); |
| 56 | - switch( $this->view ) { |
|
| 56 | + switch ($this->view) { |
|
| 57 | 57 | case 'learners': |
| 58 | 58 | $columns = array( |
| 59 | - 'title' => __( 'Learner', 'woothemes-sensei' ), |
|
| 60 | - 'date_started' => __( 'Date Started', 'woothemes-sensei' ), |
|
| 61 | - 'user_status' => __( 'Status', 'woothemes-sensei' ), |
|
| 59 | + 'title' => __('Learner', 'woothemes-sensei'), |
|
| 60 | + 'date_started' => __('Date Started', 'woothemes-sensei'), |
|
| 61 | + 'user_status' => __('Status', 'woothemes-sensei'), |
|
| 62 | 62 | ); |
| 63 | 63 | break; |
| 64 | 64 | |
| 65 | 65 | case 'lessons': |
| 66 | 66 | $columns = array( |
| 67 | - 'title' => __( 'Lesson', 'woothemes-sensei' ), |
|
| 68 | - 'num_learners' => __( '# Learners', 'woothemes-sensei' ), |
|
| 69 | - 'updated' => __( 'Last Updated', 'woothemes-sensei' ), |
|
| 67 | + 'title' => __('Lesson', 'woothemes-sensei'), |
|
| 68 | + 'num_learners' => __('# Learners', 'woothemes-sensei'), |
|
| 69 | + 'updated' => __('Last Updated', 'woothemes-sensei'), |
|
| 70 | 70 | ); |
| 71 | 71 | break; |
| 72 | 72 | |
| 73 | 73 | case 'courses': |
| 74 | 74 | default: |
| 75 | 75 | $columns = array( |
| 76 | - 'title' => __( 'Course', 'woothemes-sensei' ), |
|
| 77 | - 'num_learners' => __( '# Learners', 'woothemes-sensei' ), |
|
| 78 | - 'updated' => __( 'Last Updated', 'woothemes-sensei' ), |
|
| 76 | + 'title' => __('Course', 'woothemes-sensei'), |
|
| 77 | + 'num_learners' => __('# Learners', 'woothemes-sensei'), |
|
| 78 | + 'updated' => __('Last Updated', 'woothemes-sensei'), |
|
| 79 | 79 | ); |
| 80 | 80 | break; |
| 81 | 81 | } |
| 82 | 82 | $columns['actions'] = ''; |
| 83 | 83 | // Backwards compatible |
| 84 | - if ( 'learners' == $this->view ) { |
|
| 85 | - $columns = apply_filters( 'sensei_learners_learners_columns', $columns, $this ); |
|
| 84 | + if ('learners' == $this->view) { |
|
| 85 | + $columns = apply_filters('sensei_learners_learners_columns', $columns, $this); |
|
| 86 | 86 | } |
| 87 | - $columns = apply_filters( 'sensei_learners_default_columns', $columns, $this ); |
|
| 87 | + $columns = apply_filters('sensei_learners_default_columns', $columns, $this); |
|
| 88 | 88 | return $columns; |
| 89 | 89 | } |
| 90 | 90 | |
@@ -95,32 +95,32 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | function get_sortable_columns() { |
| 97 | 97 | $columns = array(); |
| 98 | - switch( $this->view ) { |
|
| 98 | + switch ($this->view) { |
|
| 99 | 99 | case 'learners': |
| 100 | 100 | $columns = array( |
| 101 | - 'title' => array( 'title', false ), |
|
| 101 | + 'title' => array('title', false), |
|
| 102 | 102 | ); |
| 103 | 103 | break; |
| 104 | 104 | |
| 105 | 105 | case 'lessons': |
| 106 | 106 | $columns = array( |
| 107 | - 'title' => array( 'title', false ), |
|
| 108 | - 'updated' => array( 'post_modified', false ), |
|
| 107 | + 'title' => array('title', false), |
|
| 108 | + 'updated' => array('post_modified', false), |
|
| 109 | 109 | ); |
| 110 | 110 | break; |
| 111 | 111 | |
| 112 | 112 | default: |
| 113 | 113 | $columns = array( |
| 114 | - 'title' => array( 'title', false ), |
|
| 115 | - 'updated' => array( 'post_modified', false ), |
|
| 114 | + 'title' => array('title', false), |
|
| 115 | + 'updated' => array('post_modified', false), |
|
| 116 | 116 | ); |
| 117 | 117 | break; |
| 118 | 118 | } |
| 119 | 119 | // Backwards compatible |
| 120 | - if ( 'learners' == $this->view ) { |
|
| 121 | - $columns = apply_filters( 'sensei_learners_learners_columns_sortable', $columns, $this ); |
|
| 120 | + if ('learners' == $this->view) { |
|
| 121 | + $columns = apply_filters('sensei_learners_learners_columns_sortable', $columns, $this); |
|
| 122 | 122 | } |
| 123 | - $columns = apply_filters( 'sensei_learners_default_columns_sortable', $columns, $this ); |
|
| 123 | + $columns = apply_filters('sensei_learners_default_columns_sortable', $columns, $this); |
|
| 124 | 124 | return $columns; |
| 125 | 125 | } |
| 126 | 126 | |
@@ -134,72 +134,72 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | // Handle orderby |
| 136 | 136 | $orderby = ''; |
| 137 | - if ( !empty( $_GET['orderby'] ) ) { |
|
| 138 | - if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) { |
|
| 139 | - $orderby = esc_html( $_GET['orderby'] ); |
|
| 137 | + if ( ! empty($_GET['orderby'])) { |
|
| 138 | + if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) { |
|
| 139 | + $orderby = esc_html($_GET['orderby']); |
|
| 140 | 140 | } // End If Statement |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | // Handle order |
| 144 | 144 | $order = 'DESC'; |
| 145 | - if ( !empty( $_GET['order'] ) ) { |
|
| 146 | - $order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC'; |
|
| 145 | + if ( ! empty($_GET['order'])) { |
|
| 146 | + $order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC'; |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | // Handle category selection |
| 150 | 150 | $category = false; |
| 151 | - if ( !empty( $_GET['course_cat'] ) ) { |
|
| 152 | - $category = intval( $_GET['course_cat'] ); |
|
| 151 | + if ( ! empty($_GET['course_cat'])) { |
|
| 152 | + $category = intval($_GET['course_cat']); |
|
| 153 | 153 | } // End If Statement |
| 154 | 154 | |
| 155 | 155 | // Handle search |
| 156 | 156 | $search = false; |
| 157 | - if ( !empty( $_GET['s'] ) ) { |
|
| 158 | - $search = esc_html( $_GET['s'] ); |
|
| 157 | + if ( ! empty($_GET['s'])) { |
|
| 158 | + $search = esc_html($_GET['s']); |
|
| 159 | 159 | } // End If Statement |
| 160 | 160 | |
| 161 | - $per_page = $this->get_items_per_page( 'sensei_comments_per_page' ); |
|
| 162 | - $per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' ); |
|
| 161 | + $per_page = $this->get_items_per_page('sensei_comments_per_page'); |
|
| 162 | + $per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments'); |
|
| 163 | 163 | |
| 164 | 164 | $paged = $this->get_pagenum(); |
| 165 | 165 | $offset = 0; |
| 166 | - if ( !empty($paged) ) { |
|
| 167 | - $offset = $per_page * ( $paged - 1 ); |
|
| 166 | + if ( ! empty($paged)) { |
|
| 167 | + $offset = $per_page * ($paged - 1); |
|
| 168 | 168 | } // End If Statement |
| 169 | 169 | |
| 170 | - switch( $this->view ) { |
|
| 170 | + switch ($this->view) { |
|
| 171 | 171 | case 'learners': |
| 172 | - if ( empty($orderby) ) { |
|
| 172 | + if (empty($orderby)) { |
|
| 173 | 173 | $orderby = ''; |
| 174 | 174 | } |
| 175 | - $this->items = $this->get_learners( compact( 'per_page', 'offset', 'orderby', 'order', 'search' ) ); |
|
| 175 | + $this->items = $this->get_learners(compact('per_page', 'offset', 'orderby', 'order', 'search')); |
|
| 176 | 176 | |
| 177 | 177 | break; |
| 178 | 178 | |
| 179 | 179 | case 'lessons': |
| 180 | - if ( empty($orderby) ) { |
|
| 180 | + if (empty($orderby)) { |
|
| 181 | 181 | $orderby = 'post_modified'; |
| 182 | 182 | } |
| 183 | - $this->items = $this->get_lessons( compact( 'per_page', 'offset', 'orderby', 'order', 'search' ) ); |
|
| 183 | + $this->items = $this->get_lessons(compact('per_page', 'offset', 'orderby', 'order', 'search')); |
|
| 184 | 184 | |
| 185 | 185 | break; |
| 186 | 186 | |
| 187 | 187 | default: |
| 188 | - if ( empty($orderby) ) { |
|
| 188 | + if (empty($orderby)) { |
|
| 189 | 189 | $orderby = 'post_modified'; |
| 190 | 190 | } |
| 191 | - $this->items = $this->get_courses( compact( 'per_page', 'offset', 'orderby', 'order', 'category', 'search' ) ); |
|
| 191 | + $this->items = $this->get_courses(compact('per_page', 'offset', 'orderby', 'order', 'category', 'search')); |
|
| 192 | 192 | |
| 193 | 193 | break; |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | $total_items = $this->total_items; |
| 197 | - $total_pages = ceil( $total_items / $per_page ); |
|
| 198 | - $this->set_pagination_args( array( |
|
| 197 | + $total_pages = ceil($total_items / $per_page); |
|
| 198 | + $this->set_pagination_args(array( |
|
| 199 | 199 | 'total_items' => $total_items, |
| 200 | 200 | 'total_pages' => $total_pages, |
| 201 | 201 | 'per_page' => $per_page |
| 202 | - ) ); |
|
| 202 | + )); |
|
| 203 | 203 | |
| 204 | 204 | } // End prepare_items() |
| 205 | 205 | |
@@ -213,42 +213,42 @@ discard block |
||
| 213 | 213 | * |
| 214 | 214 | * @return void |
| 215 | 215 | */ |
| 216 | - protected function get_row_data( $item ) { |
|
| 216 | + protected function get_row_data($item) { |
|
| 217 | 217 | global $wp_version; |
| 218 | 218 | |
| 219 | - switch ( $this->view ) { |
|
| 219 | + switch ($this->view) { |
|
| 220 | 220 | case 'learners' : |
| 221 | 221 | |
| 222 | 222 | // in this case the item passed in is actually the users activity on course of lesson |
| 223 | 223 | $user_activity = $item; |
| 224 | 224 | $post_id = false; |
| 225 | 225 | |
| 226 | - if( $this->lesson_id ) { |
|
| 226 | + if ($this->lesson_id) { |
|
| 227 | 227 | |
| 228 | - $post_id = intval( $this->lesson_id ); |
|
| 229 | - $object_type = __( 'lesson', 'woothemes-sensei' ); |
|
| 228 | + $post_id = intval($this->lesson_id); |
|
| 229 | + $object_type = __('lesson', 'woothemes-sensei'); |
|
| 230 | 230 | $post_type = 'lesson'; |
| 231 | 231 | |
| 232 | - } elseif( $this->course_id ) { |
|
| 232 | + } elseif ($this->course_id) { |
|
| 233 | 233 | |
| 234 | - $post_id = intval( $this->course_id ); |
|
| 235 | - $object_type = __( 'course', 'woothemes-sensei' ); |
|
| 234 | + $post_id = intval($this->course_id); |
|
| 235 | + $object_type = __('course', 'woothemes-sensei'); |
|
| 236 | 236 | $post_type = 'course'; |
| 237 | 237 | |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | - if( 'complete' == $user_activity->comment_approved || 'graded' == $user_activity->comment_approved || 'passed' == $user_activity->comment_approved ) { |
|
| 240 | + if ('complete' == $user_activity->comment_approved || 'graded' == $user_activity->comment_approved || 'passed' == $user_activity->comment_approved) { |
|
| 241 | 241 | |
| 242 | - $status_html = '<span class="graded">' .__( 'Completed', 'woothemes-sensei' ) . '</span>'; |
|
| 242 | + $status_html = '<span class="graded">'.__('Completed', 'woothemes-sensei').'</span>'; |
|
| 243 | 243 | |
| 244 | 244 | } else { |
| 245 | 245 | |
| 246 | - $status_html = '<span class="in-progress">' . __( 'In Progress', 'woothemes-sensei' ) . '</span>'; |
|
| 246 | + $status_html = '<span class="in-progress">'.__('In Progress', 'woothemes-sensei').'</span>'; |
|
| 247 | 247 | |
| 248 | 248 | } |
| 249 | 249 | |
| 250 | - $title = Sensei_Learner::get_full_name( $user_activity->user_id ); |
|
| 251 | - $a_title = sprintf( __( 'Edit “%s”' ), $title ); |
|
| 250 | + $title = Sensei_Learner::get_full_name($user_activity->user_id); |
|
| 251 | + $a_title = sprintf(__('Edit “%s”'), $title); |
|
| 252 | 252 | |
| 253 | 253 | /** |
| 254 | 254 | * sensei_learners_main_column_data filter |
@@ -263,50 +263,50 @@ discard block |
||
| 263 | 263 | * type html $action_buttons |
| 264 | 264 | * } |
| 265 | 265 | */ |
| 266 | - $column_data = apply_filters( 'sensei_learners_main_column_data', array( |
|
| 267 | - 'title' => '<strong><a class="row-title" href="' . admin_url( 'user-edit.php?user_id=' . $user_activity->user_id ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>', |
|
| 268 | - 'date_started' => get_comment_meta( $user_activity->comment_ID, 'start', true), |
|
| 266 | + $column_data = apply_filters('sensei_learners_main_column_data', array( |
|
| 267 | + 'title' => '<strong><a class="row-title" href="'.admin_url('user-edit.php?user_id='.$user_activity->user_id).'" title="'.esc_attr($a_title).'">'.$title.'</a></strong>', |
|
| 268 | + 'date_started' => get_comment_meta($user_activity->comment_ID, 'start', true), |
|
| 269 | 269 | 'user_status' => $status_html, |
| 270 | - 'actions' => '<a class="remove-learner button" data-user_id="' . $user_activity->user_id . '" data-post_id="' . $post_id . '" data-post_type="' . $post_type . '">' . sprintf( __( 'Remove from %1$s', 'woothemes-sensei' ), $object_type ) . '</a>', |
|
| 271 | - ), $item, $post_id, $post_type ); |
|
| 270 | + 'actions' => '<a class="remove-learner button" data-user_id="'.$user_activity->user_id.'" data-post_id="'.$post_id.'" data-post_type="'.$post_type.'">'.sprintf(__('Remove from %1$s', 'woothemes-sensei'), $object_type).'</a>', |
|
| 271 | + ), $item, $post_id, $post_type); |
|
| 272 | 272 | |
| 273 | 273 | break; |
| 274 | 274 | |
| 275 | 275 | case 'lessons' : |
| 276 | - $lesson_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_lesson_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_lesson_status', 'status' => 'any' ) ) ); |
|
| 277 | - $title = get_the_title( $item ); |
|
| 278 | - $a_title = sprintf( __( 'Edit “%s”' ), $title ); |
|
| 276 | + $lesson_learners = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_learners_lesson_learners', array('post_id' => $item->ID, 'type' => 'sensei_lesson_status', 'status' => 'any'))); |
|
| 277 | + $title = get_the_title($item); |
|
| 278 | + $a_title = sprintf(__('Edit “%s”'), $title); |
|
| 279 | 279 | |
| 280 | 280 | $grading_action = ''; |
| 281 | - if ( get_post_meta( $item->ID, '_quiz_has_questions', true ) ) { |
|
| 282 | - $grading_action = ' <a class="button" href="' . esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'lesson_id' => $item->ID, 'course_id' => $this->course_id ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Grading', 'woothemes-sensei' ) . '</a>'; |
|
| 281 | + if (get_post_meta($item->ID, '_quiz_has_questions', true)) { |
|
| 282 | + $grading_action = ' <a class="button" href="'.esc_url(add_query_arg(array('page' => 'sensei_grading', 'lesson_id' => $item->ID, 'course_id' => $this->course_id), admin_url('admin.php'))).'">'.__('Grading', 'woothemes-sensei').'</a>'; |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - $column_data = apply_filters( 'sensei_learners_main_column_data', array( |
|
| 286 | - 'title' => '<strong><a class="row-title" href="' . admin_url( 'post.php?action=edit&post=' . $item->ID ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>', |
|
| 285 | + $column_data = apply_filters('sensei_learners_main_column_data', array( |
|
| 286 | + 'title' => '<strong><a class="row-title" href="'.admin_url('post.php?action=edit&post='.$item->ID).'" title="'.esc_attr($a_title).'">'.$title.'</a></strong>', |
|
| 287 | 287 | 'num_learners' => $lesson_learners, |
| 288 | 288 | 'updated' => $item->post_modified, |
| 289 | - 'actions' => '<a class="button" href="' . esc_url( add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID, 'course_id' => $this->course_id, 'view' => 'learners' ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Manage learners', 'woothemes-sensei' ) . '</a> ' . $grading_action, |
|
| 290 | - ), $item, $this->course_id ); |
|
| 289 | + 'actions' => '<a class="button" href="'.esc_url(add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID, 'course_id' => $this->course_id, 'view' => 'learners'), admin_url('admin.php'))).'">'.__('Manage learners', 'woothemes-sensei').'</a> '.$grading_action, |
|
| 290 | + ), $item, $this->course_id); |
|
| 291 | 291 | break; |
| 292 | 292 | |
| 293 | 293 | case 'courses' : |
| 294 | 294 | default: |
| 295 | - $course_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_course_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any' ) ) ); |
|
| 296 | - $title = get_the_title( $item ); |
|
| 297 | - $a_title = sprintf( __( 'Edit “%s”' ), $title ); |
|
| 295 | + $course_learners = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_learners_course_learners', array('post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any'))); |
|
| 296 | + $title = get_the_title($item); |
|
| 297 | + $a_title = sprintf(__('Edit “%s”'), $title); |
|
| 298 | 298 | |
| 299 | 299 | $grading_action = ''; |
| 300 | - if ( version_compare($wp_version, '4.1', '>=') ) { |
|
| 301 | - $grading_action = ' <a class="button" href="' . esc_url( add_query_arg( array( 'page' => 'sensei_grading', 'course_id' => $item->ID ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Grading', 'woothemes-sensei' ) . '</a>'; |
|
| 300 | + if (version_compare($wp_version, '4.1', '>=')) { |
|
| 301 | + $grading_action = ' <a class="button" href="'.esc_url(add_query_arg(array('page' => 'sensei_grading', 'course_id' => $item->ID), admin_url('admin.php'))).'">'.__('Grading', 'woothemes-sensei').'</a>'; |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | - $column_data = apply_filters( 'sensei_learners_main_column_data', array( |
|
| 305 | - 'title' => '<strong><a class="row-title" href="' . admin_url( 'post.php?action=edit&post=' . $item->ID ) . '" title="' . esc_attr( $a_title ) . '">' . $title . '</a></strong>', |
|
| 304 | + $column_data = apply_filters('sensei_learners_main_column_data', array( |
|
| 305 | + 'title' => '<strong><a class="row-title" href="'.admin_url('post.php?action=edit&post='.$item->ID).'" title="'.esc_attr($a_title).'">'.$title.'</a></strong>', |
|
| 306 | 306 | 'num_learners' => $course_learners, |
| 307 | 307 | 'updated' => $item->post_modified, |
| 308 | - 'actions' => '<a class="button" href="' . esc_url( add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $item->ID, 'view' => 'learners' ), admin_url( 'admin.php' ) ) ) . '">' . __( 'Manage learners', 'woothemes-sensei' ) . '</a> ' . $grading_action, |
|
| 309 | - ), $item ); |
|
| 308 | + 'actions' => '<a class="button" href="'.esc_url(add_query_arg(array('page' => $this->page_slug, 'course_id' => $item->ID, 'view' => 'learners'), admin_url('admin.php'))).'">'.__('Manage learners', 'woothemes-sensei').'</a> '.$grading_action, |
|
| 309 | + ), $item); |
|
| 310 | 310 | |
| 311 | 311 | break; |
| 312 | 312 | } // switch |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | * @since 1.7.0 |
| 320 | 320 | * @return array courses |
| 321 | 321 | */ |
| 322 | - private function get_courses( $args ) { |
|
| 322 | + private function get_courses($args) { |
|
| 323 | 323 | $course_args = array( |
| 324 | 324 | 'post_type' => 'course', |
| 325 | 325 | 'post_status' => 'publish', |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | 'order' => $args['order'], |
| 330 | 330 | ); |
| 331 | 331 | |
| 332 | - if( $args['category'] ) { |
|
| 332 | + if ($args['category']) { |
|
| 333 | 333 | $course_args['tax_query'][] = array( |
| 334 | 334 | 'taxonomy' => 'course-category', |
| 335 | 335 | 'field' => 'id', |
@@ -337,11 +337,11 @@ discard block |
||
| 337 | 337 | ); |
| 338 | 338 | } |
| 339 | 339 | |
| 340 | - if( $args['search'] ) { |
|
| 340 | + if ($args['search']) { |
|
| 341 | 341 | $course_args['s'] = $args['search']; |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - $courses_query = new WP_Query( apply_filters( 'sensei_learners_filter_courses', $course_args ) ); |
|
| 344 | + $courses_query = new WP_Query(apply_filters('sensei_learners_filter_courses', $course_args)); |
|
| 345 | 345 | |
| 346 | 346 | $this->total_items = $courses_query->found_posts; |
| 347 | 347 | return $courses_query->posts; |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | * @since 1.7.0 |
| 353 | 353 | * @return array lessons |
| 354 | 354 | */ |
| 355 | - private function get_lessons( $args ) { |
|
| 355 | + private function get_lessons($args) { |
|
| 356 | 356 | $lesson_args = array( |
| 357 | 357 | 'post_type' => 'lesson', |
| 358 | 358 | 'post_status' => 'publish', |
@@ -362,18 +362,18 @@ discard block |
||
| 362 | 362 | 'order' => $args['order'], |
| 363 | 363 | ); |
| 364 | 364 | |
| 365 | - if( $this->course_id ) { |
|
| 365 | + if ($this->course_id) { |
|
| 366 | 366 | $lesson_args['meta_query'][] = array( |
| 367 | 367 | 'key' => '_lesson_course', |
| 368 | 368 | 'value' => $this->course_id, |
| 369 | 369 | ); |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | - if( $args['search'] ) { |
|
| 372 | + if ($args['search']) { |
|
| 373 | 373 | $lesson_args['s'] = $args['search']; |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | - $lessons_query = new WP_Query( apply_filters( 'sensei_learners_filter_lessons', $lesson_args ) ); |
|
| 376 | + $lessons_query = new WP_Query(apply_filters('sensei_learners_filter_lessons', $lesson_args)); |
|
| 377 | 377 | |
| 378 | 378 | $this->total_items = $lessons_query->found_posts; |
| 379 | 379 | return $lessons_query->posts; |
@@ -384,22 +384,22 @@ discard block |
||
| 384 | 384 | * @since 1.7.0 |
| 385 | 385 | * @return array learners |
| 386 | 386 | */ |
| 387 | - private function get_learners( $args ) { |
|
| 387 | + private function get_learners($args) { |
|
| 388 | 388 | |
| 389 | 389 | $user_ids = false; |
| 390 | 390 | $post_id = 0; |
| 391 | 391 | $activity = ''; |
| 392 | 392 | |
| 393 | - if( $this->lesson_id ) { |
|
| 394 | - $post_id = intval( $this->lesson_id ); |
|
| 393 | + if ($this->lesson_id) { |
|
| 394 | + $post_id = intval($this->lesson_id); |
|
| 395 | 395 | $activity = 'sensei_lesson_status'; |
| 396 | 396 | } |
| 397 | - elseif( $this->course_id ) { |
|
| 398 | - $post_id = intval( $this->course_id ); |
|
| 397 | + elseif ($this->course_id) { |
|
| 398 | + $post_id = intval($this->course_id); |
|
| 399 | 399 | $activity = 'sensei_course_status'; |
| 400 | 400 | } |
| 401 | 401 | |
| 402 | - if( ! $post_id || ! $activity ) { |
|
| 402 | + if ( ! $post_id || ! $activity) { |
|
| 403 | 403 | $this->total_items = 0; |
| 404 | 404 | return array(); |
| 405 | 405 | } |
@@ -415,32 +415,32 @@ discard block |
||
| 415 | 415 | ); |
| 416 | 416 | |
| 417 | 417 | // Searching users on statuses requires sub-selecting the statuses by user_ids |
| 418 | - if ( $args['search'] ) { |
|
| 418 | + if ($args['search']) { |
|
| 419 | 419 | $user_args = array( |
| 420 | - 'search' => '*' . $args['search'] . '*', |
|
| 420 | + 'search' => '*'.$args['search'].'*', |
|
| 421 | 421 | 'fields' => 'ID' |
| 422 | 422 | ); |
| 423 | 423 | // Filter for extending |
| 424 | - $user_args = apply_filters( 'sensei_learners_search_users', $user_args ); |
|
| 425 | - if ( !empty( $user_args ) ) { |
|
| 426 | - $learners_search = new WP_User_Query( $user_args ); |
|
| 424 | + $user_args = apply_filters('sensei_learners_search_users', $user_args); |
|
| 425 | + if ( ! empty($user_args)) { |
|
| 426 | + $learners_search = new WP_User_Query($user_args); |
|
| 427 | 427 | $activity_args['user_id'] = $learners_search->get_results(); |
| 428 | 428 | } |
| 429 | 429 | } |
| 430 | 430 | |
| 431 | - $activity_args = apply_filters( 'sensei_learners_filter_users', $activity_args ); |
|
| 431 | + $activity_args = apply_filters('sensei_learners_filter_users', $activity_args); |
|
| 432 | 432 | |
| 433 | 433 | // WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice |
| 434 | - $total_learners = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) ); |
|
| 434 | + $total_learners = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0))); |
|
| 435 | 435 | // Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views? |
| 436 | - if ( $total_learners < $activity_args['offset'] ) { |
|
| 437 | - $new_paged = floor( $total_learners / $activity_args['number'] ); |
|
| 436 | + if ($total_learners < $activity_args['offset']) { |
|
| 437 | + $new_paged = floor($total_learners / $activity_args['number']); |
|
| 438 | 438 | $activity_args['offset'] = $new_paged * $activity_args['number']; |
| 439 | 439 | } |
| 440 | - $learners = Sensei_Utils::sensei_check_for_activity( $activity_args, true ); |
|
| 440 | + $learners = Sensei_Utils::sensei_check_for_activity($activity_args, true); |
|
| 441 | 441 | // Need to always return an array, even with only 1 item |
| 442 | - if ( !is_array($learners) ) { |
|
| 443 | - $learners = array( $learners ); |
|
| 442 | + if ( ! is_array($learners)) { |
|
| 443 | + $learners = array($learners); |
|
| 444 | 444 | } |
| 445 | 445 | $this->total_items = $total_learners; |
| 446 | 446 | return $learners; |
@@ -453,22 +453,22 @@ discard block |
||
| 453 | 453 | * @return void |
| 454 | 454 | */ |
| 455 | 455 | public function no_items() { |
| 456 | - switch( $this->view ) { |
|
| 456 | + switch ($this->view) { |
|
| 457 | 457 | case 'learners' : |
| 458 | - $text = __( 'No learners found.', 'woothemes-sensei' ); |
|
| 458 | + $text = __('No learners found.', 'woothemes-sensei'); |
|
| 459 | 459 | break; |
| 460 | 460 | |
| 461 | 461 | case 'lessons' : |
| 462 | - $text = __( 'No lessons found.', 'woothemes-sensei' ); |
|
| 462 | + $text = __('No lessons found.', 'woothemes-sensei'); |
|
| 463 | 463 | break; |
| 464 | 464 | |
| 465 | 465 | case 'courses': |
| 466 | 466 | case 'default': |
| 467 | 467 | default: |
| 468 | - $text = __( 'No courses found.', 'woothemes-sensei' ); |
|
| 468 | + $text = __('No courses found.', 'woothemes-sensei'); |
|
| 469 | 469 | break; |
| 470 | 470 | } |
| 471 | - echo apply_filters( 'sensei_learners_no_items_text', $text ); |
|
| 471 | + echo apply_filters('sensei_learners_no_items_text', $text); |
|
| 472 | 472 | } // End no_items() |
| 473 | 473 | |
| 474 | 474 | /** |
@@ -479,40 +479,40 @@ discard block |
||
| 479 | 479 | public function data_table_header() { |
| 480 | 480 | |
| 481 | 481 | echo '<div class="learners-selects">'; |
| 482 | - do_action( 'sensei_learners_before_dropdown_filters' ); |
|
| 482 | + do_action('sensei_learners_before_dropdown_filters'); |
|
| 483 | 483 | |
| 484 | 484 | // Display Course Categories only on default view |
| 485 | - if( 'courses' == $this->view ) { |
|
| 485 | + if ('courses' == $this->view) { |
|
| 486 | 486 | |
| 487 | 487 | $selected_cat = 0; |
| 488 | - if ( isset( $_GET['course_cat'] ) && '' != esc_html( $_GET['course_cat'] ) ) { |
|
| 489 | - $selected_cat = intval( $_GET['course_cat'] ); |
|
| 488 | + if (isset($_GET['course_cat']) && '' != esc_html($_GET['course_cat'])) { |
|
| 489 | + $selected_cat = intval($_GET['course_cat']); |
|
| 490 | 490 | } |
| 491 | 491 | |
| 492 | - $cats = get_terms( 'course-category', array( 'hide_empty' => false ) ); |
|
| 492 | + $cats = get_terms('course-category', array('hide_empty' => false)); |
|
| 493 | 493 | |
| 494 | - echo '<div class="select-box">' . "\n"; |
|
| 494 | + echo '<div class="select-box">'."\n"; |
|
| 495 | 495 | |
| 496 | - echo '<select id="course-category-options" data-placeholder="' . __( 'Course Category', 'woothemes-sensei' ) . '" name="learners_course_cat" class="chosen_select widefat">' . "\n"; |
|
| 496 | + echo '<select id="course-category-options" data-placeholder="'.__('Course Category', 'woothemes-sensei').'" name="learners_course_cat" class="chosen_select widefat">'."\n"; |
|
| 497 | 497 | |
| 498 | - echo '<option value="0">' . __( 'All Course Categories', 'woothemes-sensei' ) . '</option>' . "\n"; |
|
| 498 | + echo '<option value="0">'.__('All Course Categories', 'woothemes-sensei').'</option>'."\n"; |
|
| 499 | 499 | |
| 500 | - foreach( $cats as $cat ) { |
|
| 501 | - echo '<option value="' . $cat->term_id . '"' . selected( $cat->term_id, $selected_cat, false ) . '>' . $cat->name . '</option>' . "\n"; |
|
| 500 | + foreach ($cats as $cat) { |
|
| 501 | + echo '<option value="'.$cat->term_id.'"'.selected($cat->term_id, $selected_cat, false).'>'.$cat->name.'</option>'."\n"; |
|
| 502 | 502 | } |
| 503 | 503 | |
| 504 | - echo '</select>' . "\n"; |
|
| 504 | + echo '</select>'."\n"; |
|
| 505 | 505 | |
| 506 | - echo '</div>' . "\n"; |
|
| 506 | + echo '</div>'."\n"; |
|
| 507 | 507 | } |
| 508 | 508 | echo '</div><!-- /.learners-selects -->'; |
| 509 | 509 | |
| 510 | 510 | $menu = array(); |
| 511 | 511 | // Have Course no Lesson |
| 512 | - if( $this->course_id && ! $this->lesson_id ) { |
|
| 512 | + if ($this->course_id && ! $this->lesson_id) { |
|
| 513 | 513 | |
| 514 | 514 | $learners_class = $lessons_class = ''; |
| 515 | - switch( $this->view ) { |
|
| 515 | + switch ($this->view) { |
|
| 516 | 516 | case 'learners': |
| 517 | 517 | $learners_class = 'current'; |
| 518 | 518 | break; |
@@ -531,12 +531,12 @@ discard block |
||
| 531 | 531 | $learner_args['view'] = 'learners'; |
| 532 | 532 | $lesson_args['view'] = 'lessons'; |
| 533 | 533 | |
| 534 | - $menu['learners'] = '<a class="' . $learners_class . '" href="' . esc_url( add_query_arg( $learner_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Learners', 'woothemes-sensei' ) . '</a>'; |
|
| 535 | - $menu['lessons'] = '<a class="' . $lessons_class . '" href="' . esc_url( add_query_arg( $lesson_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Lessons', 'woothemes-sensei' ) . '</a>'; |
|
| 534 | + $menu['learners'] = '<a class="'.$learners_class.'" href="'.esc_url(add_query_arg($learner_args, admin_url('admin.php'))).'">'.__('Learners', 'woothemes-sensei').'</a>'; |
|
| 535 | + $menu['lessons'] = '<a class="'.$lessons_class.'" href="'.esc_url(add_query_arg($lesson_args, admin_url('admin.php'))).'">'.__('Lessons', 'woothemes-sensei').'</a>'; |
|
| 536 | 536 | |
| 537 | 537 | } |
| 538 | 538 | // Have Course and Lesson |
| 539 | - elseif( $this->course_id && $this->lesson_id ) { |
|
| 539 | + elseif ($this->course_id && $this->lesson_id) { |
|
| 540 | 540 | |
| 541 | 541 | $query_args = array( |
| 542 | 542 | 'page' => $this->page_slug, |
@@ -544,18 +544,18 @@ discard block |
||
| 544 | 544 | 'view' => 'lessons' |
| 545 | 545 | ); |
| 546 | 546 | |
| 547 | - $course = get_the_title( $this->course_id ); |
|
| 547 | + $course = get_the_title($this->course_id); |
|
| 548 | 548 | |
| 549 | - $menu['back'] = '<a href="' . esc_url( add_query_arg( $query_args, admin_url( 'admin.php' ) ) ) . '">' . sprintf( __( '%1$sBack to %2$s%3$s', 'woothemes-sensei' ), '<em>← ', $course, '</em>' ) . '</a>'; |
|
| 549 | + $menu['back'] = '<a href="'.esc_url(add_query_arg($query_args, admin_url('admin.php'))).'">'.sprintf(__('%1$sBack to %2$s%3$s', 'woothemes-sensei'), '<em>← ', $course, '</em>').'</a>'; |
|
| 550 | 550 | } |
| 551 | - $menu = apply_filters( 'sensei_learners_sub_menu', $menu ); |
|
| 552 | - if ( !empty($menu) ) { |
|
| 553 | - echo '<ul class="subsubsub">' . "\n"; |
|
| 554 | - foreach ( $menu as $class => $item ) { |
|
| 555 | - $menu[ $class ] = "\t<li class='$class'>$item"; |
|
| 551 | + $menu = apply_filters('sensei_learners_sub_menu', $menu); |
|
| 552 | + if ( ! empty($menu)) { |
|
| 553 | + echo '<ul class="subsubsub">'."\n"; |
|
| 554 | + foreach ($menu as $class => $item) { |
|
| 555 | + $menu[$class] = "\t<li class='$class'>$item"; |
|
| 556 | 556 | } |
| 557 | - echo implode( " |</li>\n", $menu ) . "</li>\n"; |
|
| 558 | - echo '</ul>' . "\n"; |
|
| 557 | + echo implode(" |</li>\n", $menu)."</li>\n"; |
|
| 558 | + echo '</ul>'."\n"; |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | } // End data_table_header() |
@@ -580,50 +580,50 @@ discard block |
||
| 580 | 580 | $form_post_type = ''; |
| 581 | 581 | $form_course_id = 0; |
| 582 | 582 | $form_lesson_id = 0; |
| 583 | - if( $this->course_id && ! $this->lesson_id ) { |
|
| 584 | - $post_title = get_the_title( $this->course_id ); |
|
| 585 | - $post_type = __( 'Course', 'woothemes-sensei' ); |
|
| 583 | + if ($this->course_id && ! $this->lesson_id) { |
|
| 584 | + $post_title = get_the_title($this->course_id); |
|
| 585 | + $post_type = __('Course', 'woothemes-sensei'); |
|
| 586 | 586 | $form_post_type = 'course'; |
| 587 | 587 | $form_course_id = $this->course_id; |
| 588 | 588 | } |
| 589 | - elseif( $this->course_id && $this->lesson_id ) { |
|
| 590 | - $post_title = get_the_title( $this->lesson_id ); |
|
| 591 | - $post_type = __( 'Lesson', 'woothemes-sensei' ); |
|
| 589 | + elseif ($this->course_id && $this->lesson_id) { |
|
| 590 | + $post_title = get_the_title($this->lesson_id); |
|
| 591 | + $post_type = __('Lesson', 'woothemes-sensei'); |
|
| 592 | 592 | $form_post_type = 'lesson'; |
| 593 | 593 | $form_course_id = $this->course_id; |
| 594 | 594 | $form_lesson_id = $this->lesson_id; |
| 595 | - $course_title = get_the_title( $this->course_id ); |
|
| 595 | + $course_title = get_the_title($this->course_id); |
|
| 596 | 596 | } |
| 597 | - if ( empty($form_post_type) ) { |
|
| 597 | + if (empty($form_post_type)) { |
|
| 598 | 598 | return; |
| 599 | 599 | } |
| 600 | 600 | ?> |
| 601 | 601 | <div class="postbox"> |
| 602 | - <h3><span><?php printf( __( 'Add Learner to %1$s', 'woothemes-sensei' ), $post_type ); ?></span></h3> |
|
| 602 | + <h3><span><?php printf(__('Add Learner to %1$s', 'woothemes-sensei'), $post_type); ?></span></h3> |
|
| 603 | 603 | <div class="inside"> |
| 604 | 604 | <form name="add_learner" action="" method="post"> |
| 605 | 605 | <p> |
| 606 | - <input name="add_user_id" placeholder="<?php _e( 'Find learner', 'woothemes-sensei' ) ;?>" id="add_learner_search" style="min-width:300px;" /> |
|
| 607 | - <?php if( 'lesson' == $form_post_type ) { ?> |
|
| 608 | - <label for="add_complete_lesson"><input type="checkbox" id="add_complete_lesson" name="add_complete_lesson" value="yes" /> <?php _e( 'Complete lesson for learner', 'woothemes-sensei' ); ?></label> |
|
| 609 | - <?php } elseif( 'course' == $form_post_type ) { ?> |
|
| 610 | - <label for="add_complete_course"><input type="checkbox" id="add_complete_course" name="add_complete_course" value="yes" /> <?php _e( 'Complete course for learner', 'woothemes-sensei' ); ?></label> |
|
| 606 | + <input name="add_user_id" placeholder="<?php _e('Find learner', 'woothemes-sensei'); ?>" id="add_learner_search" style="min-width:300px;" /> |
|
| 607 | + <?php if ('lesson' == $form_post_type) { ?> |
|
| 608 | + <label for="add_complete_lesson"><input type="checkbox" id="add_complete_lesson" name="add_complete_lesson" value="yes" /> <?php _e('Complete lesson for learner', 'woothemes-sensei'); ?></label> |
|
| 609 | + <?php } elseif ('course' == $form_post_type) { ?> |
|
| 610 | + <label for="add_complete_course"><input type="checkbox" id="add_complete_course" name="add_complete_course" value="yes" /> <?php _e('Complete course for learner', 'woothemes-sensei'); ?></label> |
|
| 611 | 611 | <?php } ?> |
| 612 | 612 | <br/> |
| 613 | - <span class="description"><?php _e( 'Search for a user by typing their name or username.', 'woothemes-sensei' ); ?></span> |
|
| 613 | + <span class="description"><?php _e('Search for a user by typing their name or username.', 'woothemes-sensei'); ?></span> |
|
| 614 | 614 | </p> |
| 615 | - <p><?php submit_button( sprintf( __( 'Add to \'%1$s\'', 'woothemes-sensei' ), $post_title ), 'primary', 'add_learner_submit', false, array() ); ?></p> |
|
| 616 | - <?php if( 'lesson' == $form_post_type ) { ?> |
|
| 617 | - <p><span class="description"><?php printf( __( 'Learner will also be added to the course \'%1$s\' if they are not already taking it.', 'woothemes-sensei' ), $course_title ); ?></span></p> |
|
| 615 | + <p><?php submit_button(sprintf(__('Add to \'%1$s\'', 'woothemes-sensei'), $post_title), 'primary', 'add_learner_submit', false, array()); ?></p> |
|
| 616 | + <?php if ('lesson' == $form_post_type) { ?> |
|
| 617 | + <p><span class="description"><?php printf(__('Learner will also be added to the course \'%1$s\' if they are not already taking it.', 'woothemes-sensei'), $course_title); ?></span></p> |
|
| 618 | 618 | <?php } ?> |
| 619 | 619 | |
| 620 | 620 | <input type="hidden" name="add_post_type" value="<?php echo $form_post_type; ?>" /> |
| 621 | 621 | <input type="hidden" name="add_course_id" value="<?php echo $form_course_id; ?>" /> |
| 622 | 622 | <input type="hidden" name="add_lesson_id" value="<?php echo $form_lesson_id; ?>" /> |
| 623 | 623 | <?php |
| 624 | - do_action( 'sensei_learners_add_learner_form' ); |
|
| 624 | + do_action('sensei_learners_add_learner_form'); |
|
| 625 | 625 | ?> |
| 626 | - <?php wp_nonce_field( 'add_learner_to_sensei', 'add_learner_nonce' ); ?> |
|
| 626 | + <?php wp_nonce_field('add_learner_to_sensei', 'add_learner_nonce'); ?> |
|
| 627 | 627 | </form> |
| 628 | 628 | </div> |
| 629 | 629 | </div> |
@@ -635,19 +635,19 @@ discard block |
||
| 635 | 635 | * @since 1.7.0 |
| 636 | 636 | * @return string $text |
| 637 | 637 | */ |
| 638 | - public function search_button( $text = '' ) { |
|
| 638 | + public function search_button($text = '') { |
|
| 639 | 639 | |
| 640 | - switch( $this->view ) { |
|
| 640 | + switch ($this->view) { |
|
| 641 | 641 | case 'learners': |
| 642 | - $text = __( 'Search Learners', 'woothemes-sensei' ); |
|
| 642 | + $text = __('Search Learners', 'woothemes-sensei'); |
|
| 643 | 643 | break; |
| 644 | 644 | |
| 645 | 645 | case 'lessons': |
| 646 | - $text = __( 'Search Lessons', 'woothemes-sensei' ); |
|
| 646 | + $text = __('Search Lessons', 'woothemes-sensei'); |
|
| 647 | 647 | break; |
| 648 | 648 | |
| 649 | 649 | default: |
| 650 | - $text = __( 'Search Courses', 'woothemes-sensei' ); |
|
| 650 | + $text = __('Search Courses', 'woothemes-sensei'); |
|
| 651 | 651 | break; |
| 652 | 652 | } |
| 653 | 653 | |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Sensei Grading Class |
@@ -23,30 +23,30 @@ discard block |
||
| 23 | 23 | * |
| 24 | 24 | * @param $file |
| 25 | 25 | */ |
| 26 | - public function __construct ( $file ) { |
|
| 27 | - $this->name = __( 'Grading', 'woothemes-sensei' ); |
|
| 26 | + public function __construct($file) { |
|
| 27 | + $this->name = __('Grading', 'woothemes-sensei'); |
|
| 28 | 28 | $this->file = $file; |
| 29 | 29 | $this->page_slug = 'sensei_grading'; |
| 30 | 30 | |
| 31 | 31 | // Admin functions |
| 32 | - if ( is_admin() ) { |
|
| 33 | - add_action( 'admin_menu', array( $this, 'grading_admin_menu' ), 20); |
|
| 34 | - add_action( 'grading_wrapper_container', array( $this, 'wrapper_container' ) ); |
|
| 35 | - if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) { |
|
| 36 | - add_action( 'admin_print_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 37 | - add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) ); |
|
| 32 | + if (is_admin()) { |
|
| 33 | + add_action('admin_menu', array($this, 'grading_admin_menu'), 20); |
|
| 34 | + add_action('grading_wrapper_container', array($this, 'wrapper_container')); |
|
| 35 | + if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) { |
|
| 36 | + add_action('admin_print_scripts', array($this, 'enqueue_scripts')); |
|
| 37 | + add_action('admin_print_styles', array($this, 'enqueue_styles')); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - add_action( 'admin_init', array( $this, 'admin_process_grading_submission' ) ); |
|
| 40 | + add_action('admin_init', array($this, 'admin_process_grading_submission')); |
|
| 41 | 41 | |
| 42 | - add_action( 'admin_notices', array( $this, 'add_grading_notices' ) ); |
|
| 42 | + add_action('admin_notices', array($this, 'add_grading_notices')); |
|
| 43 | 43 | // add_action( 'sensei_grading_notices', array( $this, 'sensei_grading_notices' ) ); |
| 44 | 44 | } // End If Statement |
| 45 | 45 | |
| 46 | 46 | // Ajax functions |
| 47 | - if ( is_admin() ) { |
|
| 48 | - add_action( 'wp_ajax_get_lessons_dropdown', array( $this, 'get_lessons_dropdown' ) ); |
|
| 49 | - add_action( 'wp_ajax_get_redirect_url', array( $this, 'get_redirect_url' ) ); |
|
| 47 | + if (is_admin()) { |
|
| 48 | + add_action('wp_ajax_get_lessons_dropdown', array($this, 'get_lessons_dropdown')); |
|
| 49 | + add_action('wp_ajax_get_redirect_url', array($this, 'get_redirect_url')); |
|
| 50 | 50 | } // End If Statement |
| 51 | 51 | } // End __construct() |
| 52 | 52 | |
@@ -59,8 +59,8 @@ discard block |
||
| 59 | 59 | public function grading_admin_menu() { |
| 60 | 60 | global $menu; |
| 61 | 61 | |
| 62 | - if ( current_user_can( 'manage_sensei_grades' ) ) { |
|
| 63 | - $grading_page = add_submenu_page('sensei', __('Grading', 'woothemes-sensei'), __('Grading', 'woothemes-sensei') , 'manage_sensei_grades', $this->page_slug, array( $this, 'grading_page' ) ); |
|
| 62 | + if (current_user_can('manage_sensei_grades')) { |
|
| 63 | + $grading_page = add_submenu_page('sensei', __('Grading', 'woothemes-sensei'), __('Grading', 'woothemes-sensei'), 'manage_sensei_grades', $this->page_slug, array($this, 'grading_page')); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | } // End grading_admin_menu() |
@@ -73,12 +73,12 @@ discard block |
||
| 73 | 73 | * @since 1.3.0 |
| 74 | 74 | * @return void |
| 75 | 75 | */ |
| 76 | - public function enqueue_scripts () { |
|
| 76 | + public function enqueue_scripts() { |
|
| 77 | 77 | |
| 78 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
|
| 78 | + $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; |
|
| 79 | 79 | |
| 80 | 80 | // Load Grading JS |
| 81 | - wp_enqueue_script( 'sensei-grading-general', Sensei()->plugin_url . 'assets/js/grading-general' . $suffix . '.js', array( 'jquery' ), Sensei()->version ); |
|
| 81 | + wp_enqueue_script('sensei-grading-general', Sensei()->plugin_url.'assets/js/grading-general'.$suffix.'.js', array('jquery'), Sensei()->version); |
|
| 82 | 82 | |
| 83 | 83 | } // End enqueue_scripts() |
| 84 | 84 | |
@@ -90,11 +90,11 @@ discard block |
||
| 90 | 90 | * @since 1.0.0 |
| 91 | 91 | * @return void |
| 92 | 92 | */ |
| 93 | - public function enqueue_styles () { |
|
| 93 | + public function enqueue_styles() { |
|
| 94 | 94 | |
| 95 | - wp_enqueue_style( Sensei()->token . '-admin' ); |
|
| 95 | + wp_enqueue_style(Sensei()->token.'-admin'); |
|
| 96 | 96 | |
| 97 | - wp_enqueue_style( 'woothemes-sensei-settings-api', Sensei()->plugin_url . 'assets/css/settings.css', '', Sensei()->version ); |
|
| 97 | + wp_enqueue_style('woothemes-sensei-settings-api', Sensei()->plugin_url.'assets/css/settings.css', '', Sensei()->version); |
|
| 98 | 98 | |
| 99 | 99 | } // End enqueue_styles() |
| 100 | 100 | |
@@ -106,12 +106,12 @@ discard block |
||
| 106 | 106 | public function load_data_table_files() { |
| 107 | 107 | |
| 108 | 108 | // Load Grading Classes |
| 109 | - $classes_to_load = array( 'list-table', |
|
| 109 | + $classes_to_load = array('list-table', |
|
| 110 | 110 | 'grading-main', |
| 111 | 111 | 'grading-user-quiz' |
| 112 | 112 | ); |
| 113 | - foreach ( $classes_to_load as $class_file ) { |
|
| 114 | - Sensei()->load_class( $class_file ); |
|
| 113 | + foreach ($classes_to_load as $class_file) { |
|
| 114 | + Sensei()->load_class($class_file); |
|
| 115 | 115 | } // End For Loop |
| 116 | 116 | } // End load_data_table_files() |
| 117 | 117 | |
@@ -123,16 +123,16 @@ discard block |
||
| 123 | 123 | * @param undefined $optional_data optional constructor arguments |
| 124 | 124 | * @return object class instance object |
| 125 | 125 | */ |
| 126 | - public function load_data_object( $name = '', $data = 0, $optional_data = null ) { |
|
| 126 | + public function load_data_object($name = '', $data = 0, $optional_data = null) { |
|
| 127 | 127 | // Load Analysis data |
| 128 | - $object_name = 'WooThemes_Sensei_Grading_' . $name; |
|
| 129 | - if ( is_null($optional_data) ) { |
|
| 130 | - $sensei_grading_object = new $object_name( $data ); |
|
| 128 | + $object_name = 'WooThemes_Sensei_Grading_'.$name; |
|
| 129 | + if (is_null($optional_data)) { |
|
| 130 | + $sensei_grading_object = new $object_name($data); |
|
| 131 | 131 | } |
| 132 | 132 | else { |
| 133 | - $sensei_grading_object = new $object_name( $data, $optional_data ); |
|
| 133 | + $sensei_grading_object = new $object_name($data, $optional_data); |
|
| 134 | 134 | } // End If Statement |
| 135 | - if ( 'Main' == $name ) { |
|
| 135 | + if ('Main' == $name) { |
|
| 136 | 136 | $sensei_grading_object->prepare_items(); |
| 137 | 137 | } // End If Statement |
| 138 | 138 | return $sensei_grading_object; |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function grading_page() { |
| 148 | 148 | |
| 149 | - if ( isset( $_GET['quiz_id'] ) && 0 < intval( $_GET['quiz_id'] ) && isset( $_GET['user'] ) && 0 < intval( $_GET['user'] ) ) { |
|
| 149 | + if (isset($_GET['quiz_id']) && 0 < intval($_GET['quiz_id']) && isset($_GET['user']) && 0 < intval($_GET['user'])) { |
|
| 150 | 150 | $this->grading_user_quiz_view(); |
| 151 | 151 | } |
| 152 | 152 | else { |
@@ -162,23 +162,23 @@ discard block |
||
| 162 | 162 | public function grading_default_view() { |
| 163 | 163 | |
| 164 | 164 | // Load Grading data |
| 165 | - if( !empty( $_GET['course_id'] ) ) { |
|
| 166 | - $course_id = intval( $_GET['course_id'] ); |
|
| 165 | + if ( ! empty($_GET['course_id'])) { |
|
| 166 | + $course_id = intval($_GET['course_id']); |
|
| 167 | 167 | } |
| 168 | - if( !empty( $_GET['lesson_id'] ) ) { |
|
| 169 | - $lesson_id = intval( $_GET['lesson_id'] ); |
|
| 168 | + if ( ! empty($_GET['lesson_id'])) { |
|
| 169 | + $lesson_id = intval($_GET['lesson_id']); |
|
| 170 | 170 | } |
| 171 | - if( !empty( $_GET['user_id'] ) ) { |
|
| 172 | - $user_id = intval( $_GET['user_id'] ); |
|
| 171 | + if ( ! empty($_GET['user_id'])) { |
|
| 172 | + $user_id = intval($_GET['user_id']); |
|
| 173 | 173 | } |
| 174 | - if( !empty( $_GET['view'] ) ) { |
|
| 175 | - $view = esc_html( $_GET['view'] ); |
|
| 174 | + if ( ! empty($_GET['view'])) { |
|
| 175 | + $view = esc_html($_GET['view']); |
|
| 176 | 176 | } |
| 177 | - $sensei_grading_overview = $this->load_data_object( 'Main', compact( 'course_id', 'lesson_id', 'user_id', 'view' ) ); |
|
| 177 | + $sensei_grading_overview = $this->load_data_object('Main', compact('course_id', 'lesson_id', 'user_id', 'view')); |
|
| 178 | 178 | |
| 179 | 179 | // Wrappers |
| 180 | - do_action( 'grading_before_container' ); |
|
| 181 | - do_action( 'grading_wrapper_container', 'top' ); |
|
| 180 | + do_action('grading_before_container'); |
|
| 181 | + do_action('grading_wrapper_container', 'top'); |
|
| 182 | 182 | $this->grading_headers(); |
| 183 | 183 | ?> |
| 184 | 184 | <div id="poststuff" class="sensei-grading-wrap"> |
@@ -186,12 +186,12 @@ discard block |
||
| 186 | 186 | <?php $sensei_grading_overview->display(); ?> |
| 187 | 187 | </div> |
| 188 | 188 | <div class="sensei-grading-extra"> |
| 189 | - <?php do_action( 'sensei_grading_extra' ); ?> |
|
| 189 | + <?php do_action('sensei_grading_extra'); ?> |
|
| 190 | 190 | </div> |
| 191 | 191 | </div> |
| 192 | 192 | <?php |
| 193 | - do_action( 'grading_wrapper_container', 'bottom' ); |
|
| 194 | - do_action( 'grading_after_container' ); |
|
| 193 | + do_action('grading_wrapper_container', 'bottom'); |
|
| 194 | + do_action('grading_after_container'); |
|
| 195 | 195 | } // End grading_default_view() |
| 196 | 196 | |
| 197 | 197 | /** |
@@ -204,17 +204,17 @@ discard block |
||
| 204 | 204 | // Load Grading data |
| 205 | 205 | $user_id = 0; |
| 206 | 206 | $quiz_id = 0; |
| 207 | - if( isset( $_GET['user'] ) ) { |
|
| 208 | - $user_id = intval( $_GET['user'] ); |
|
| 207 | + if (isset($_GET['user'])) { |
|
| 208 | + $user_id = intval($_GET['user']); |
|
| 209 | 209 | } |
| 210 | - if( isset( $_GET['quiz_id'] ) ) { |
|
| 211 | - $quiz_id = intval( $_GET['quiz_id'] ); |
|
| 210 | + if (isset($_GET['quiz_id'])) { |
|
| 211 | + $quiz_id = intval($_GET['quiz_id']); |
|
| 212 | 212 | } |
| 213 | - $sensei_grading_user_profile = $this->load_data_object( 'User_Quiz', $user_id, $quiz_id ); |
|
| 213 | + $sensei_grading_user_profile = $this->load_data_object('User_Quiz', $user_id, $quiz_id); |
|
| 214 | 214 | // Wrappers |
| 215 | - do_action( 'grading_before_container' ); |
|
| 216 | - do_action( 'grading_wrapper_container', 'top' ); |
|
| 217 | - $this->grading_headers( array( 'nav' => 'user_quiz' ) ); |
|
| 215 | + do_action('grading_before_container'); |
|
| 216 | + do_action('grading_wrapper_container', 'top'); |
|
| 217 | + $this->grading_headers(array('nav' => 'user_quiz')); |
|
| 218 | 218 | ?> |
| 219 | 219 | <div id="poststuff" class="sensei-grading-wrap user-profile"> |
| 220 | 220 | <div class="sensei-grading-main"> |
@@ -223,8 +223,8 @@ discard block |
||
| 223 | 223 | </div> |
| 224 | 224 | </div> |
| 225 | 225 | <?php |
| 226 | - do_action( 'grading_wrapper_container', 'bottom' ); |
|
| 227 | - do_action( 'grading_after_container' ); |
|
| 226 | + do_action('grading_wrapper_container', 'bottom'); |
|
| 227 | + do_action('grading_after_container'); |
|
| 228 | 228 | } // End grading_user_quiz_view() |
| 229 | 229 | |
| 230 | 230 | /** |
@@ -233,14 +233,14 @@ discard block |
||
| 233 | 233 | * @param array $args |
| 234 | 234 | * @return void |
| 235 | 235 | */ |
| 236 | - public function grading_headers( $args = array( 'nav' => 'default' ) ) { |
|
| 236 | + public function grading_headers($args = array('nav' => 'default')) { |
|
| 237 | 237 | |
| 238 | - $function = 'grading_' . $args['nav'] . '_nav'; |
|
| 238 | + $function = 'grading_'.$args['nav'].'_nav'; |
|
| 239 | 239 | $this->$function(); |
| 240 | 240 | ?> |
| 241 | - <p class="powered-by-woo"><?php _e( 'Powered by', 'woothemes-sensei' ); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p> |
|
| 241 | + <p class="powered-by-woo"><?php _e('Powered by', 'woothemes-sensei'); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p> |
|
| 242 | 242 | <?php |
| 243 | - do_action( 'sensei_grading_after_headers' ); |
|
| 243 | + do_action('sensei_grading_after_headers'); |
|
| 244 | 244 | } // End grading_headers() |
| 245 | 245 | |
| 246 | 246 | /** |
@@ -249,10 +249,10 @@ discard block |
||
| 249 | 249 | * @param $which string |
| 250 | 250 | * @return void |
| 251 | 251 | */ |
| 252 | - public function wrapper_container( $which ) { |
|
| 253 | - if ( 'top' == $which ) { |
|
| 252 | + public function wrapper_container($which) { |
|
| 253 | + if ('top' == $which) { |
|
| 254 | 254 | ?><div id="woothemes-sensei" class="wrap woothemes-sensei"><?php |
| 255 | - } elseif ( 'bottom' == $which ) { |
|
| 255 | + } elseif ('bottom' == $which) { |
|
| 256 | 256 | ?></div><!--/#woothemes-sensei--><?php |
| 257 | 257 | } // End If Statement |
| 258 | 258 | } // End wrapper_container() |
@@ -265,29 +265,29 @@ discard block |
||
| 265 | 265 | public function grading_default_nav() { |
| 266 | 266 | global $wp_version; |
| 267 | 267 | |
| 268 | - $title = sprintf( '<a href="%s">%s</a>', esc_url(add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ) ), esc_html( $this->name ) ); |
|
| 269 | - if ( isset( $_GET['course_id'] ) ) { |
|
| 270 | - $course_id = intval( $_GET['course_id'] ); |
|
| 271 | - if ( version_compare($wp_version, '4.1', '>=') ) { |
|
| 272 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) ); |
|
| 273 | - $title .= sprintf( ' <span class="course-title">> <a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) ); |
|
| 268 | + $title = sprintf('<a href="%s">%s</a>', esc_url(add_query_arg(array('page' => $this->page_slug), admin_url('admin.php'))), esc_html($this->name)); |
|
| 269 | + if (isset($_GET['course_id'])) { |
|
| 270 | + $course_id = intval($_GET['course_id']); |
|
| 271 | + if (version_compare($wp_version, '4.1', '>=')) { |
|
| 272 | + $url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php')); |
|
| 273 | + $title .= sprintf(' <span class="course-title">> <a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id)); |
|
| 274 | 274 | } |
| 275 | 275 | else { |
| 276 | - $title .= sprintf( ' <span class="course-title">> %s</span>', get_the_title( $course_id ) ); |
|
| 276 | + $title .= sprintf(' <span class="course-title">> %s</span>', get_the_title($course_id)); |
|
| 277 | 277 | } |
| 278 | 278 | } |
| 279 | - if ( isset( $_GET['lesson_id'] ) ) { |
|
| 280 | - $lesson_id = intval( $_GET['lesson_id'] ); |
|
| 281 | - $title .= ' <span class="lesson-title">> ' . get_the_title( intval( $lesson_id ) ) . '</span>'; |
|
| 279 | + if (isset($_GET['lesson_id'])) { |
|
| 280 | + $lesson_id = intval($_GET['lesson_id']); |
|
| 281 | + $title .= ' <span class="lesson-title">> '.get_the_title(intval($lesson_id)).'</span>'; |
|
| 282 | 282 | } |
| 283 | - if ( isset( $_GET['user_id'] ) && 0 < intval( $_GET['user_id'] ) ) { |
|
| 283 | + if (isset($_GET['user_id']) && 0 < intval($_GET['user_id'])) { |
|
| 284 | 284 | |
| 285 | - $user_name = Sensei_Learner::get_full_name( $_GET['user_id'] ); |
|
| 286 | - $title .= ' <span class="user-title">> ' . $user_name . '</span>'; |
|
| 285 | + $user_name = Sensei_Learner::get_full_name($_GET['user_id']); |
|
| 286 | + $title .= ' <span class="user-title">> '.$user_name.'</span>'; |
|
| 287 | 287 | |
| 288 | 288 | } // End If Statement |
| 289 | 289 | ?> |
| 290 | - <h2><?php echo apply_filters( 'sensei_grading_nav_title', $title ); ?></h2> |
|
| 290 | + <h2><?php echo apply_filters('sensei_grading_nav_title', $title); ?></h2> |
|
| 291 | 291 | <?php |
| 292 | 292 | } // End grading_default_nav() |
| 293 | 293 | |
@@ -299,29 +299,29 @@ discard block |
||
| 299 | 299 | public function grading_user_quiz_nav() { |
| 300 | 300 | global $wp_version; |
| 301 | 301 | |
| 302 | - $title = sprintf( '<a href="%s">%s</a>', add_query_arg( array( 'page' => $this->page_slug ), admin_url( 'admin.php' ) ), esc_html( $this->name ) ); |
|
| 303 | - if ( isset( $_GET['quiz_id'] ) ) { |
|
| 304 | - $quiz_id = intval( $_GET['quiz_id'] ); |
|
| 305 | - $lesson_id = get_post_meta( $quiz_id, '_quiz_lesson', true ); |
|
| 306 | - $course_id = get_post_meta( $lesson_id, '_lesson_course', true ); |
|
| 307 | - if ( version_compare($wp_version, '4.1', '>=') ) { |
|
| 308 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) ); |
|
| 309 | - $title .= sprintf( ' <span class="course-title">> <a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $course_id ) ); |
|
| 302 | + $title = sprintf('<a href="%s">%s</a>', add_query_arg(array('page' => $this->page_slug), admin_url('admin.php')), esc_html($this->name)); |
|
| 303 | + if (isset($_GET['quiz_id'])) { |
|
| 304 | + $quiz_id = intval($_GET['quiz_id']); |
|
| 305 | + $lesson_id = get_post_meta($quiz_id, '_quiz_lesson', true); |
|
| 306 | + $course_id = get_post_meta($lesson_id, '_lesson_course', true); |
|
| 307 | + if (version_compare($wp_version, '4.1', '>=')) { |
|
| 308 | + $url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php')); |
|
| 309 | + $title .= sprintf(' <span class="course-title">> <a href="%s">%s</a></span>', esc_url($url), get_the_title($course_id)); |
|
| 310 | 310 | } |
| 311 | 311 | else { |
| 312 | - $title .= sprintf( ' <span class="course-title">> %s</span>', get_the_title( $course_id ) ); |
|
| 312 | + $title .= sprintf(' <span class="course-title">> %s</span>', get_the_title($course_id)); |
|
| 313 | 313 | } |
| 314 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $lesson_id ), admin_url( 'admin.php' ) ); |
|
| 315 | - $title .= sprintf( ' <span class="lesson-title">> <a href="%s">%s</a></span>', esc_url( $url ), get_the_title( $lesson_id ) ); |
|
| 314 | + $url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $lesson_id), admin_url('admin.php')); |
|
| 315 | + $title .= sprintf(' <span class="lesson-title">> <a href="%s">%s</a></span>', esc_url($url), get_the_title($lesson_id)); |
|
| 316 | 316 | } |
| 317 | - if ( isset( $_GET['user'] ) && 0 < intval( $_GET['user'] ) ) { |
|
| 317 | + if (isset($_GET['user']) && 0 < intval($_GET['user'])) { |
|
| 318 | 318 | |
| 319 | - $user_name = Sensei_Learner::get_full_name( $_GET['user'] ); |
|
| 320 | - $title .= ' <span class="user-title">> ' . $user_name . '</span>'; |
|
| 319 | + $user_name = Sensei_Learner::get_full_name($_GET['user']); |
|
| 320 | + $title .= ' <span class="user-title">> '.$user_name.'</span>'; |
|
| 321 | 321 | |
| 322 | 322 | } // End If Statement |
| 323 | 323 | ?> |
| 324 | - <h2><?php echo apply_filters( 'sensei_grading_nav_title', $title ); ?></h2> |
|
| 324 | + <h2><?php echo apply_filters('sensei_grading_nav_title', $title); ?></h2> |
|
| 325 | 325 | <?php |
| 326 | 326 | } // End grading_user_quiz_nav() |
| 327 | 327 | |
@@ -330,9 +330,9 @@ discard block |
||
| 330 | 330 | * @since 1.7.0 |
| 331 | 331 | * @return array |
| 332 | 332 | */ |
| 333 | - public function get_stati( $type ) { |
|
| 333 | + public function get_stati($type) { |
|
| 334 | 334 | $statuses = array(); |
| 335 | - switch( $type ) { |
|
| 335 | + switch ($type) { |
|
| 336 | 336 | case 'course' : |
| 337 | 337 | $statuses = array( |
| 338 | 338 | 'in-progress', |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | * @param array $args (default: array()) |
| 363 | 363 | * @return object |
| 364 | 364 | */ |
| 365 | - public function count_statuses( $args = array() ) { |
|
| 365 | + public function count_statuses($args = array()) { |
|
| 366 | 366 | global $wpdb; |
| 367 | 367 | |
| 368 | 368 | /** |
@@ -373,71 +373,71 @@ discard block |
||
| 373 | 373 | * @since 1.8.0 |
| 374 | 374 | * @param array $args |
| 375 | 375 | */ |
| 376 | - $args = apply_filters( 'sensei_count_statuses_args', $args ); |
|
| 376 | + $args = apply_filters('sensei_count_statuses_args', $args); |
|
| 377 | 377 | |
| 378 | - if ( 'course' == $args['type'] ) { |
|
| 378 | + if ('course' == $args['type']) { |
|
| 379 | 379 | $type = 'sensei_course_status'; |
| 380 | 380 | } |
| 381 | 381 | else { |
| 382 | 382 | $type = 'sensei_lesson_status'; |
| 383 | 383 | } |
| 384 | - $cache_key = 'sensei-' . $args['type'] . '-statuses'; |
|
| 384 | + $cache_key = 'sensei-'.$args['type'].'-statuses'; |
|
| 385 | 385 | |
| 386 | 386 | $query = "SELECT comment_approved, COUNT( * ) AS total FROM {$wpdb->comments} WHERE comment_type = %s "; |
| 387 | 387 | |
| 388 | 388 | // Restrict to specific posts |
| 389 | - if ( isset( $args['post__in'] ) && !empty( $args['post__in'] ) && is_array( $args['post__in'] ) ) { |
|
| 390 | - $query .= ' AND comment_post_ID IN (' . implode( ',', array_map( 'absint', $args['post__in'] ) ) . ')'; |
|
| 389 | + if (isset($args['post__in']) && ! empty($args['post__in']) && is_array($args['post__in'])) { |
|
| 390 | + $query .= ' AND comment_post_ID IN ('.implode(',', array_map('absint', $args['post__in'])).')'; |
|
| 391 | 391 | } |
| 392 | - elseif ( !empty( $args['post_id'] ) ) { |
|
| 393 | - $query .= $wpdb->prepare( ' AND comment_post_ID = %d', $args['post_id'] ); |
|
| 392 | + elseif ( ! empty($args['post_id'])) { |
|
| 393 | + $query .= $wpdb->prepare(' AND comment_post_ID = %d', $args['post_id']); |
|
| 394 | 394 | } |
| 395 | 395 | // Restrict to specific users |
| 396 | - if ( isset( $args['user_id'] ) && is_array( $args['user_id'] ) ) { |
|
| 397 | - $query .= ' AND user_id IN (' . implode( ',', array_map( 'absint', $args['user_id'] ) ) . ')'; |
|
| 396 | + if (isset($args['user_id']) && is_array($args['user_id'])) { |
|
| 397 | + $query .= ' AND user_id IN ('.implode(',', array_map('absint', $args['user_id'])).')'; |
|
| 398 | 398 | } |
| 399 | - elseif ( !empty( $args['user_id'] ) ) { |
|
| 400 | - $query .= $wpdb->prepare( ' AND user_id = %d', $args['user_id'] ); |
|
| 399 | + elseif ( ! empty($args['user_id'])) { |
|
| 400 | + $query .= $wpdb->prepare(' AND user_id = %d', $args['user_id']); |
|
| 401 | 401 | } |
| 402 | 402 | $query .= ' GROUP BY comment_approved'; |
| 403 | 403 | |
| 404 | - $counts = wp_cache_get( $cache_key, 'counts' ); |
|
| 405 | - if ( false === $counts ) { |
|
| 406 | - $sql = $wpdb->prepare( $query, $type ); |
|
| 407 | - $results = (array) $wpdb->get_results( $sql, ARRAY_A ); |
|
| 408 | - $counts = array_fill_keys( $this->get_stati( $type ), 0 ); |
|
| 404 | + $counts = wp_cache_get($cache_key, 'counts'); |
|
| 405 | + if (false === $counts) { |
|
| 406 | + $sql = $wpdb->prepare($query, $type); |
|
| 407 | + $results = (array) $wpdb->get_results($sql, ARRAY_A); |
|
| 408 | + $counts = array_fill_keys($this->get_stati($type), 0); |
|
| 409 | 409 | |
| 410 | - foreach ( $results as $row ) { |
|
| 411 | - $counts[ $row['comment_approved'] ] = $row['total']; |
|
| 410 | + foreach ($results as $row) { |
|
| 411 | + $counts[$row['comment_approved']] = $row['total']; |
|
| 412 | 412 | } |
| 413 | - wp_cache_set( $cache_key, $counts, 'counts' ); |
|
| 413 | + wp_cache_set($cache_key, $counts, 'counts'); |
|
| 414 | 414 | } |
| 415 | 415 | |
| 416 | - if( ! isset( $counts['graded'] ) ) { |
|
| 416 | + if ( ! isset($counts['graded'])) { |
|
| 417 | 417 | $counts['graded'] = 0; |
| 418 | 418 | } |
| 419 | 419 | |
| 420 | - if( ! isset( $counts['ungraded'] ) ) { |
|
| 420 | + if ( ! isset($counts['ungraded'])) { |
|
| 421 | 421 | $counts['ungraded'] = 0; |
| 422 | 422 | } |
| 423 | 423 | |
| 424 | - if( ! isset( $counts['passed'] ) ) { |
|
| 424 | + if ( ! isset($counts['passed'])) { |
|
| 425 | 425 | $counts['passed'] = 0; |
| 426 | 426 | } |
| 427 | 427 | |
| 428 | - if( ! isset( $counts['failed'] ) ) { |
|
| 428 | + if ( ! isset($counts['failed'])) { |
|
| 429 | 429 | $counts['failed'] = 0; |
| 430 | 430 | } |
| 431 | 431 | |
| 432 | - if( ! isset( $counts['in-progress'] ) ) { |
|
| 432 | + if ( ! isset($counts['in-progress'])) { |
|
| 433 | 433 | $counts['in-progress'] = 0; |
| 434 | 434 | } |
| 435 | 435 | |
| 436 | - if( ! isset( $counts['complete'] ) ) { |
|
| 436 | + if ( ! isset($counts['complete'])) { |
|
| 437 | 437 | $counts['complete'] = 0; |
| 438 | 438 | } |
| 439 | 439 | |
| 440 | - return apply_filters( 'sensei_count_statuses', $counts, $type ); |
|
| 440 | + return apply_filters('sensei_count_statuses', $counts, $type); |
|
| 441 | 441 | } // End sensei_count_statuses() |
| 442 | 442 | |
| 443 | 443 | /** |
@@ -445,11 +445,11 @@ discard block |
||
| 445 | 445 | * @since 1.7.0 |
| 446 | 446 | * @return string |
| 447 | 447 | */ |
| 448 | - public function courses_drop_down_html( $selected_course_id = 0 ) { |
|
| 448 | + public function courses_drop_down_html($selected_course_id = 0) { |
|
| 449 | 449 | |
| 450 | 450 | $html = ''; |
| 451 | 451 | |
| 452 | - $course_args = array( 'post_type' => 'course', |
|
| 452 | + $course_args = array('post_type' => 'course', |
|
| 453 | 453 | 'posts_per_page' => -1, |
| 454 | 454 | 'orderby' => 'title', |
| 455 | 455 | 'order' => 'ASC', |
@@ -457,12 +457,12 @@ discard block |
||
| 457 | 457 | 'suppress_filters' => 0, |
| 458 | 458 | 'fields' => 'ids', |
| 459 | 459 | ); |
| 460 | - $courses = get_posts( apply_filters( 'sensei_grading_filter_courses', $course_args ) ); |
|
| 460 | + $courses = get_posts(apply_filters('sensei_grading_filter_courses', $course_args)); |
|
| 461 | 461 | |
| 462 | - $html .= '<option value="">' . __( 'Select a course', 'woothemes-sensei' ) . '</option>'; |
|
| 463 | - if ( count( $courses ) > 0 ) { |
|
| 464 | - foreach ($courses as $course_id){ |
|
| 465 | - $html .= '<option value="' . esc_attr( absint( $course_id ) ) . '" ' . selected( $course_id, $selected_course_id, false ) . '>' . esc_html( get_the_title( $course_id ) ) . '</option>' . "\n"; |
|
| 462 | + $html .= '<option value="">'.__('Select a course', 'woothemes-sensei').'</option>'; |
|
| 463 | + if (count($courses) > 0) { |
|
| 464 | + foreach ($courses as $course_id) { |
|
| 465 | + $html .= '<option value="'.esc_attr(absint($course_id)).'" '.selected($course_id, $selected_course_id, false).'>'.esc_html(get_the_title($course_id)).'</option>'."\n"; |
|
| 466 | 466 | } // End For Loop |
| 467 | 467 | } // End If Statement |
| 468 | 468 | |
@@ -483,20 +483,20 @@ discard block |
||
| 483 | 483 | $course_data = array(); |
| 484 | 484 | parse_str($data, $course_data); |
| 485 | 485 | |
| 486 | - $course_id = intval( $course_data['course_id'] ); |
|
| 486 | + $course_id = intval($course_data['course_id']); |
|
| 487 | 487 | |
| 488 | - $html = $this->lessons_drop_down_html( $course_id ); |
|
| 488 | + $html = $this->lessons_drop_down_html($course_id); |
|
| 489 | 489 | |
| 490 | 490 | echo $html; |
| 491 | 491 | die(); // WordPress may print out a spurious zero without this can be particularly bad if using JSON |
| 492 | 492 | } |
| 493 | 493 | |
| 494 | - public function lessons_drop_down_html( $course_id = 0, $selected_lesson_id = 0 ) { |
|
| 494 | + public function lessons_drop_down_html($course_id = 0, $selected_lesson_id = 0) { |
|
| 495 | 495 | |
| 496 | 496 | $html = ''; |
| 497 | - if ( 0 < intval( $course_id ) ) { |
|
| 497 | + if (0 < intval($course_id)) { |
|
| 498 | 498 | |
| 499 | - $lesson_args = array( 'post_type' => 'lesson', |
|
| 499 | + $lesson_args = array('post_type' => 'lesson', |
|
| 500 | 500 | 'posts_per_page' => -1, |
| 501 | 501 | 'orderby' => 'title', |
| 502 | 502 | 'order' => 'ASC', |
@@ -506,12 +506,12 @@ discard block |
||
| 506 | 506 | 'suppress_filters' => 0, |
| 507 | 507 | 'fields' => 'ids', |
| 508 | 508 | ); |
| 509 | - $lessons = get_posts( apply_filters( 'sensei_grading_filter_lessons', $lesson_args ) ); |
|
| 509 | + $lessons = get_posts(apply_filters('sensei_grading_filter_lessons', $lesson_args)); |
|
| 510 | 510 | |
| 511 | - $html .= '<option value="">' . __( 'Select a lesson', 'woothemes-sensei' ) . '</option>'; |
|
| 512 | - if ( count( $lessons ) > 0 ) { |
|
| 513 | - foreach ( $lessons as $lesson_id ){ |
|
| 514 | - $html .= '<option value="' . esc_attr( absint( $lesson_id ) ) . '" ' . selected( $lesson_id, $selected_lesson_id, false ) . '>' . esc_html( get_the_title( $lesson_id ) ) . '</option>' . "\n"; |
|
| 511 | + $html .= '<option value="">'.__('Select a lesson', 'woothemes-sensei').'</option>'; |
|
| 512 | + if (count($lessons) > 0) { |
|
| 513 | + foreach ($lessons as $lesson_id) { |
|
| 514 | + $html .= '<option value="'.esc_attr(absint($lesson_id)).'" '.selected($lesson_id, $selected_lesson_id, false).'>'.esc_html(get_the_title($lesson_id)).'</option>'."\n"; |
|
| 515 | 515 | } // End For Loop |
| 516 | 516 | } // End If Statement |
| 517 | 517 | |
@@ -532,10 +532,10 @@ discard block |
||
| 532 | 532 | public function admin_process_grading_submission() { |
| 533 | 533 | |
| 534 | 534 | // NEEDS REFACTOR/OPTIMISING, such as combining the various meta data stored against the sensei_user_answer entry |
| 535 | - if( ! isset( $_POST['sensei_manual_grade'] ) |
|
| 536 | - || ! wp_verify_nonce( $_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading' ) |
|
| 537 | - || ! isset( $_GET['quiz_id'] ) |
|
| 538 | - || $_GET['quiz_id'] != $_POST['sensei_manual_grade'] ) { |
|
| 535 | + if ( ! isset($_POST['sensei_manual_grade']) |
|
| 536 | + || ! wp_verify_nonce($_POST['_wp_sensei_manual_grading_nonce'], 'sensei_manual_grading') |
|
| 537 | + || ! isset($_GET['quiz_id']) |
|
| 538 | + || $_GET['quiz_id'] != $_POST['sensei_manual_grade']) { |
|
| 539 | 539 | |
| 540 | 540 | return false; //exit and do not grade |
| 541 | 541 | |
@@ -545,30 +545,30 @@ discard block |
||
| 545 | 545 | $user_id = $_GET['user']; |
| 546 | 546 | |
| 547 | 547 | |
| 548 | - $questions = Sensei_Utils::sensei_get_quiz_questions( $quiz_id ); |
|
| 549 | - $quiz_lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id ); |
|
| 548 | + $questions = Sensei_Utils::sensei_get_quiz_questions($quiz_id); |
|
| 549 | + $quiz_lesson_id = Sensei()->quiz->get_lesson_id($quiz_id); |
|
| 550 | 550 | $quiz_grade = 0; |
| 551 | 551 | $count = 0; |
| 552 | 552 | $quiz_grade_total = $_POST['quiz_grade_total']; |
| 553 | 553 | $all_question_grades = array(); |
| 554 | 554 | $all_answers_feedback = array(); |
| 555 | 555 | |
| 556 | - foreach( $questions as $question ) { |
|
| 556 | + foreach ($questions as $question) { |
|
| 557 | 557 | |
| 558 | 558 | ++$count; |
| 559 | 559 | $question_id = $question->ID; |
| 560 | 560 | |
| 561 | - if( isset( $_POST[ 'question_' . $question_id ] ) ) { |
|
| 561 | + if (isset($_POST['question_'.$question_id])) { |
|
| 562 | 562 | |
| 563 | 563 | $question_grade = 0; |
| 564 | - if( $_POST[ 'question_' . $question_id ] == 'right' ) { |
|
| 564 | + if ($_POST['question_'.$question_id] == 'right') { |
|
| 565 | 565 | |
| 566 | - $question_grade = $_POST[ 'question_' . $question_id . '_grade' ]; |
|
| 566 | + $question_grade = $_POST['question_'.$question_id.'_grade']; |
|
| 567 | 567 | |
| 568 | 568 | } |
| 569 | 569 | |
| 570 | 570 | // add data to the array that will, after the loop, be stored on the lesson status |
| 571 | - $all_question_grades[ $question_id ] = $question_grade; |
|
| 571 | + $all_question_grades[$question_id] = $question_grade; |
|
| 572 | 572 | |
| 573 | 573 | // tally up the total quiz grade |
| 574 | 574 | $quiz_grade += $question_grade; |
@@ -577,41 +577,41 @@ discard block |
||
| 577 | 577 | |
| 578 | 578 | // Question answer feedback / notes |
| 579 | 579 | $question_feedback = ''; |
| 580 | - if( isset( $_POST[ 'questions_feedback' ][ $question_id ] ) ){ |
|
| 580 | + if (isset($_POST['questions_feedback'][$question_id])) { |
|
| 581 | 581 | |
| 582 | - $question_feedback = wp_unslash( $_POST[ 'questions_feedback' ][ $question_id ] ); |
|
| 582 | + $question_feedback = wp_unslash($_POST['questions_feedback'][$question_id]); |
|
| 583 | 583 | |
| 584 | 584 | } |
| 585 | - $all_answers_feedback[ $question_id ] = $question_feedback; |
|
| 585 | + $all_answers_feedback[$question_id] = $question_feedback; |
|
| 586 | 586 | |
| 587 | 587 | } // end for each $questions |
| 588 | 588 | |
| 589 | 589 | //store all question grades on the lesson status |
| 590 | - Sensei()->quiz->set_user_grades( $all_question_grades, $quiz_lesson_id , $user_id ); |
|
| 590 | + Sensei()->quiz->set_user_grades($all_question_grades, $quiz_lesson_id, $user_id); |
|
| 591 | 591 | |
| 592 | 592 | //store the feedback from grading |
| 593 | - Sensei()->quiz->save_user_answers_feedback( $all_answers_feedback, $quiz_lesson_id , $user_id ); |
|
| 593 | + Sensei()->quiz->save_user_answers_feedback($all_answers_feedback, $quiz_lesson_id, $user_id); |
|
| 594 | 594 | |
| 595 | 595 | // $_POST['all_questions_graded'] is set when all questions have been graded |
| 596 | 596 | // in the class sensei grading user quiz -> display() |
| 597 | - if( $_POST['all_questions_graded'] == 'yes' ) { |
|
| 597 | + if ($_POST['all_questions_graded'] == 'yes') { |
|
| 598 | 598 | |
| 599 | 599 | // set the users total quiz grade |
| 600 | - if ( 0 < intval( $quiz_grade_total ) ) { |
|
| 601 | - $grade = abs( round( ( doubleval( $quiz_grade ) * 100 ) / ( $quiz_grade_total ), 2 ) ); |
|
| 600 | + if (0 < intval($quiz_grade_total)) { |
|
| 601 | + $grade = abs(round((doubleval($quiz_grade) * 100) / ($quiz_grade_total), 2)); |
|
| 602 | 602 | } |
| 603 | 603 | else { |
| 604 | 604 | $grade = 0; |
| 605 | 605 | } |
| 606 | - Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id ); |
|
| 606 | + Sensei_Utils::sensei_grade_quiz($quiz_id, $grade, $user_id); |
|
| 607 | 607 | |
| 608 | 608 | // Duplicating what Frontend->sensei_complete_quiz() does |
| 609 | - $pass_required = get_post_meta( $quiz_id, '_pass_required', true ); |
|
| 610 | - $quiz_passmark = abs( round( doubleval( get_post_meta( $quiz_id, '_quiz_passmark', true ) ), 2 ) ); |
|
| 609 | + $pass_required = get_post_meta($quiz_id, '_pass_required', true); |
|
| 610 | + $quiz_passmark = abs(round(doubleval(get_post_meta($quiz_id, '_quiz_passmark', true)), 2)); |
|
| 611 | 611 | $lesson_metadata = array(); |
| 612 | - if ( $pass_required ) { |
|
| 612 | + if ($pass_required) { |
|
| 613 | 613 | // Student has reached the pass mark and lesson is complete |
| 614 | - if ( $quiz_passmark <= $grade ) { |
|
| 614 | + if ($quiz_passmark <= $grade) { |
|
| 615 | 615 | $lesson_status = 'passed'; |
| 616 | 616 | } |
| 617 | 617 | else { |
@@ -624,9 +624,9 @@ discard block |
||
| 624 | 624 | } |
| 625 | 625 | $lesson_metadata['grade'] = $grade; // Technically already set as part of "WooThemes_Sensei_Utils::sensei_grade_quiz()" above |
| 626 | 626 | |
| 627 | - Sensei_Utils::update_lesson_status( $user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata ); |
|
| 627 | + Sensei_Utils::update_lesson_status($user_id, $quiz_lesson_id, $lesson_status, $lesson_metadata); |
|
| 628 | 628 | |
| 629 | - if( in_array( $lesson_status, array( 'passed', 'graded' ) ) ) { |
|
| 629 | + if (in_array($lesson_status, array('passed', 'graded'))) { |
|
| 630 | 630 | |
| 631 | 631 | /** |
| 632 | 632 | * Summary. |
@@ -638,27 +638,27 @@ discard block |
||
| 638 | 638 | * @param int $user_id |
| 639 | 639 | * @param int $quiz_lesson_id |
| 640 | 640 | */ |
| 641 | - do_action( 'sensei_user_lesson_end', $user_id, $quiz_lesson_id ); |
|
| 641 | + do_action('sensei_user_lesson_end', $user_id, $quiz_lesson_id); |
|
| 642 | 642 | |
| 643 | 643 | } // end if in_array |
| 644 | 644 | |
| 645 | 645 | }// end if $_POST['all_que... |
| 646 | 646 | |
| 647 | - if( isset( $_POST['sensei_grade_next_learner'] ) && strlen( $_POST['sensei_grade_next_learner'] ) > 0 ) { |
|
| 647 | + if (isset($_POST['sensei_grade_next_learner']) && strlen($_POST['sensei_grade_next_learner']) > 0) { |
|
| 648 | 648 | |
| 649 | - $load_url = add_query_arg( array( 'message' => 'graded' ) ); |
|
| 649 | + $load_url = add_query_arg(array('message' => 'graded')); |
|
| 650 | 650 | |
| 651 | - } elseif ( isset( $_POST['_wp_http_referer'] ) ) { |
|
| 651 | + } elseif (isset($_POST['_wp_http_referer'])) { |
|
| 652 | 652 | |
| 653 | - $load_url = add_query_arg( array( 'message' => 'graded' ), $_POST['_wp_http_referer'] ); |
|
| 653 | + $load_url = add_query_arg(array('message' => 'graded'), $_POST['_wp_http_referer']); |
|
| 654 | 654 | |
| 655 | 655 | } else { |
| 656 | 656 | |
| 657 | - $load_url = add_query_arg( array( 'message' => 'graded' ) ); |
|
| 657 | + $load_url = add_query_arg(array('message' => 'graded')); |
|
| 658 | 658 | |
| 659 | 659 | } |
| 660 | 660 | |
| 661 | - wp_safe_redirect( esc_url_raw( $load_url ) ); |
|
| 661 | + wp_safe_redirect(esc_url_raw($load_url)); |
|
| 662 | 662 | exit; |
| 663 | 663 | |
| 664 | 664 | } // end admin_process_grading_submission |
@@ -669,13 +669,13 @@ discard block |
||
| 669 | 669 | $lesson_data = array(); |
| 670 | 670 | parse_str($data, $lesson_data); |
| 671 | 671 | |
| 672 | - $lesson_id = intval( $lesson_data['lesson_id'] ); |
|
| 673 | - $course_id = intval( $lesson_data['course_id'] ); |
|
| 674 | - $grading_view = sanitize_text_field( $lesson_data['view'] ); |
|
| 672 | + $lesson_id = intval($lesson_data['lesson_id']); |
|
| 673 | + $course_id = intval($lesson_data['course_id']); |
|
| 674 | + $grading_view = sanitize_text_field($lesson_data['view']); |
|
| 675 | 675 | |
| 676 | 676 | $redirect_url = ''; |
| 677 | - if ( 0 < $lesson_id && 0 < $course_id ) { |
|
| 678 | - $redirect_url = esc_url_raw( apply_filters( 'sensei_ajax_redirect_url', add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $lesson_id, 'course_id' => $course_id, 'view' => $grading_view ), admin_url( 'admin.php' ) ) ) ); |
|
| 677 | + if (0 < $lesson_id && 0 < $course_id) { |
|
| 678 | + $redirect_url = esc_url_raw(apply_filters('sensei_ajax_redirect_url', add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $lesson_id, 'course_id' => $course_id, 'view' => $grading_view), admin_url('admin.php')))); |
|
| 679 | 679 | } // End If Statement |
| 680 | 680 | |
| 681 | 681 | echo $redirect_url; |
@@ -683,11 +683,11 @@ discard block |
||
| 683 | 683 | } |
| 684 | 684 | |
| 685 | 685 | public function add_grading_notices() { |
| 686 | - if( isset( $_GET['page'] ) && $this->page_slug == $_GET['page'] && isset( $_GET['message'] ) && $_GET['message'] ) { |
|
| 687 | - if( 'graded' == $_GET['message'] ) { |
|
| 686 | + if (isset($_GET['page']) && $this->page_slug == $_GET['page'] && isset($_GET['message']) && $_GET['message']) { |
|
| 687 | + if ('graded' == $_GET['message']) { |
|
| 688 | 688 | $msg = array( |
| 689 | 689 | 'updated', |
| 690 | - __( 'Quiz Graded Successfully!', 'woothemes-sensei' ), |
|
| 690 | + __('Quiz Graded Successfully!', 'woothemes-sensei'), |
|
| 691 | 691 | ); |
| 692 | 692 | } |
| 693 | 693 | ?> |
@@ -699,9 +699,9 @@ discard block |
||
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 | public function sensei_grading_notices() { |
| 702 | - if ( isset( $_GET['action'] ) && 'graded' == $_GET['action'] ) { |
|
| 702 | + if (isset($_GET['action']) && 'graded' == $_GET['action']) { |
|
| 703 | 703 | echo '<div class="grading-notice updated">'; |
| 704 | - echo '<p>' . __( 'Quiz Graded Successfully!', 'woothemes-sensei' ) . '</p>'; |
|
| 704 | + echo '<p>'.__('Quiz Graded Successfully!', 'woothemes-sensei').'</p>'; |
|
| 705 | 705 | echo '</div>'; |
| 706 | 706 | } // End If Statement |
| 707 | 707 | } // End sensei_grading_notices() |
@@ -724,16 +724,16 @@ discard block |
||
| 724 | 724 | * |
| 725 | 725 | * @return int $quiz_grade total sum of all question grades |
| 726 | 726 | */ |
| 727 | - public static function grade_quiz_auto( $quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto' ) { |
|
| 727 | + public static function grade_quiz_auto($quiz_id = 0, $submitted = array(), $total_questions = 0, $quiz_grade_type = 'auto') { |
|
| 728 | 728 | |
| 729 | - if( ! ( intval( $quiz_id ) > 0 ) || ! $submitted |
|
| 730 | - || $quiz_grade_type != 'auto' ) { |
|
| 729 | + if ( ! (intval($quiz_id) > 0) || ! $submitted |
|
| 730 | + || $quiz_grade_type != 'auto') { |
|
| 731 | 731 | return false; // exit early |
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | |
| 735 | 735 | $user_id = get_current_user_id(); |
| 736 | - $lesson_id = Sensei()->quiz->get_lesson_id( $quiz_id ) ; |
|
| 736 | + $lesson_id = Sensei()->quiz->get_lesson_id($quiz_id); |
|
| 737 | 737 | $quiz_autogradable = true; |
| 738 | 738 | |
| 739 | 739 | /** |
@@ -747,23 +747,23 @@ discard block |
||
| 747 | 747 | * 'gap-fill'. |
| 748 | 748 | * } |
| 749 | 749 | */ |
| 750 | - $autogradable_question_types = apply_filters( 'sensei_autogradable_question_types', array( 'multiple-choice', 'boolean', 'gap-fill' ) ); |
|
| 750 | + $autogradable_question_types = apply_filters('sensei_autogradable_question_types', array('multiple-choice', 'boolean', 'gap-fill')); |
|
| 751 | 751 | |
| 752 | 752 | $grade_total = 0; |
| 753 | 753 | $all_question_grades = array(); |
| 754 | - foreach( $submitted as $question_id => $answer ) { |
|
| 754 | + foreach ($submitted as $question_id => $answer) { |
|
| 755 | 755 | |
| 756 | 756 | // check if the question is autogradable, either by type, or because the grade is 0 |
| 757 | - $question_type = Sensei()->question->get_question_type( $question_id ); |
|
| 758 | - $achievable_grade = Sensei()->question->get_question_grade( $question_id ); |
|
| 757 | + $question_type = Sensei()->question->get_question_type($question_id); |
|
| 758 | + $achievable_grade = Sensei()->question->get_question_grade($question_id); |
|
| 759 | 759 | // Question has a zero grade, so skip grading |
| 760 | - if ( 0 == $achievable_grade ) { |
|
| 761 | - $all_question_grades[ $question_id ] = $achievable_grade; |
|
| 760 | + if (0 == $achievable_grade) { |
|
| 761 | + $all_question_grades[$question_id] = $achievable_grade; |
|
| 762 | 762 | } |
| 763 | - elseif ( in_array( $question_type, $autogradable_question_types ) ) { |
|
| 763 | + elseif (in_array($question_type, $autogradable_question_types)) { |
|
| 764 | 764 | // Get user question grade |
| 765 | - $question_grade = Sensei_Utils::sensei_grade_question_auto( $question_id, $question_type, $answer, $user_id ); |
|
| 766 | - $all_question_grades[ $question_id ] = $question_grade; |
|
| 765 | + $question_grade = Sensei_Utils::sensei_grade_question_auto($question_id, $question_type, $answer, $user_id); |
|
| 766 | + $all_question_grades[$question_id] = $question_grade; |
|
| 767 | 767 | $grade_total += $question_grade; |
| 768 | 768 | |
| 769 | 769 | } else { |
@@ -776,27 +776,27 @@ discard block |
||
| 776 | 776 | }// end for each question |
| 777 | 777 | |
| 778 | 778 | // Only if the whole quiz was autogradable do we set a grade |
| 779 | - if ( $quiz_autogradable ) { |
|
| 779 | + if ($quiz_autogradable) { |
|
| 780 | 780 | |
| 781 | - $quiz_total = Sensei_Utils::sensei_get_quiz_total( $quiz_id ); |
|
| 781 | + $quiz_total = Sensei_Utils::sensei_get_quiz_total($quiz_id); |
|
| 782 | 782 | // Check for zero total from grades |
| 783 | - if ( 0 < $quiz_total ) { |
|
| 784 | - $grade = abs( round( ( doubleval( $grade_total ) * 100 ) / ( $quiz_total ), 2 ) ); |
|
| 783 | + if (0 < $quiz_total) { |
|
| 784 | + $grade = abs(round((doubleval($grade_total) * 100) / ($quiz_total), 2)); |
|
| 785 | 785 | } |
| 786 | 786 | else { |
| 787 | 787 | $grade = 0; |
| 788 | 788 | } |
| 789 | - Sensei_Utils::sensei_grade_quiz( $quiz_id, $grade, $user_id, $quiz_grade_type ); |
|
| 789 | + Sensei_Utils::sensei_grade_quiz($quiz_id, $grade, $user_id, $quiz_grade_type); |
|
| 790 | 790 | |
| 791 | 791 | } else { |
| 792 | 792 | |
| 793 | - $grade = new WP_Error( 'autograde', __( 'This quiz is not able to be automatically graded.', 'woothemes-sensei' ) ); |
|
| 793 | + $grade = new WP_Error('autograde', __('This quiz is not able to be automatically graded.', 'woothemes-sensei')); |
|
| 794 | 794 | |
| 795 | 795 | } |
| 796 | 796 | |
| 797 | 797 | // store the auto gradable grades. If the quiz is not auto gradable the grades can be use as the default |
| 798 | 798 | // when doing manual grading. |
| 799 | - Sensei()->quiz-> set_user_grades( $all_question_grades, $lesson_id, $user_id ); |
|
| 799 | + Sensei()->quiz-> set_user_grades($all_question_grades, $lesson_id, $user_id); |
|
| 800 | 800 | |
| 801 | 801 | return $grade; |
| 802 | 802 | |
@@ -816,22 +816,22 @@ discard block |
||
| 816 | 816 | * |
| 817 | 817 | * @return int $question_grade |
| 818 | 818 | */ |
| 819 | - public static function grade_question_auto( $question_id = 0, $question_type = '', $answer = '', $user_id = 0 ) { |
|
| 819 | + public static function grade_question_auto($question_id = 0, $question_type = '', $answer = '', $user_id = 0) { |
|
| 820 | 820 | |
| 821 | - if( intval( $user_id ) == 0 ) { |
|
| 821 | + if (intval($user_id) == 0) { |
|
| 822 | 822 | |
| 823 | 823 | $user_id = get_current_user_id(); |
| 824 | 824 | |
| 825 | 825 | } |
| 826 | 826 | |
| 827 | - if( ! ( intval( $question_id ) > 0 ) ) { |
|
| 827 | + if ( ! (intval($question_id) > 0)) { |
|
| 828 | 828 | |
| 829 | 829 | return false; |
| 830 | 830 | |
| 831 | 831 | } |
| 832 | 832 | |
| 833 | 833 | |
| 834 | - Sensei()->question->get_question_type( $question_id ); |
|
| 834 | + Sensei()->question->get_question_type($question_id); |
|
| 835 | 835 | |
| 836 | 836 | /** |
| 837 | 837 | * Applying a grade before the auto grading takes place. |
@@ -845,42 +845,42 @@ discard block |
||
| 845 | 845 | * @param string $question_type one of the Sensei question type. |
| 846 | 846 | * @param string $answer user supplied question answer |
| 847 | 847 | */ |
| 848 | - $question_grade = apply_filters( 'sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer ); |
|
| 848 | + $question_grade = apply_filters('sensei_pre_grade_question_auto', false, $question_id, $question_type, $answer); |
|
| 849 | 849 | |
| 850 | - if ( false !== $question_grade ) { |
|
| 850 | + if (false !== $question_grade) { |
|
| 851 | 851 | |
| 852 | 852 | return $question_grade; |
| 853 | 853 | |
| 854 | 854 | } |
| 855 | 855 | |
| 856 | 856 | // auto grading core |
| 857 | - if( in_array( $question_type , array( 'multiple-choice' , 'boolean' ) ) ){ |
|
| 857 | + if (in_array($question_type, array('multiple-choice', 'boolean'))) { |
|
| 858 | 858 | |
| 859 | - $right_answer = (array) get_post_meta( $question_id, '_question_right_answer', true ); |
|
| 859 | + $right_answer = (array) get_post_meta($question_id, '_question_right_answer', true); |
|
| 860 | 860 | |
| 861 | - if( 0 == get_magic_quotes_gpc() ) { |
|
| 862 | - $answer = wp_unslash( $answer ); |
|
| 861 | + if (0 == get_magic_quotes_gpc()) { |
|
| 862 | + $answer = wp_unslash($answer); |
|
| 863 | 863 | } |
| 864 | 864 | $answer = (array) $answer; |
| 865 | - if ( is_array( $right_answer ) && count( $right_answer ) == count( $answer ) ) { |
|
| 865 | + if (is_array($right_answer) && count($right_answer) == count($answer)) { |
|
| 866 | 866 | // Loop through all answers ensure none are 'missing' |
| 867 | 867 | $all_correct = true; |
| 868 | - foreach ( $answer as $check_answer ) { |
|
| 869 | - if ( !in_array( $check_answer, $right_answer ) ) { |
|
| 868 | + foreach ($answer as $check_answer) { |
|
| 869 | + if ( ! in_array($check_answer, $right_answer)) { |
|
| 870 | 870 | $all_correct = false; |
| 871 | 871 | } |
| 872 | 872 | } |
| 873 | 873 | // If all correct then grade |
| 874 | - if ( $all_correct ) { |
|
| 875 | - $question_grade = Sensei()->question->get_question_grade( $question_id ); |
|
| 874 | + if ($all_correct) { |
|
| 875 | + $question_grade = Sensei()->question->get_question_grade($question_id); |
|
| 876 | 876 | } |
| 877 | 877 | } |
| 878 | 878 | |
| 879 | - } elseif( 'gap-fill' == $question_type ){ |
|
| 879 | + } elseif ('gap-fill' == $question_type) { |
|
| 880 | 880 | |
| 881 | - $question_grade = self::grade_gap_fill_question( $question_id ,$answer ); |
|
| 881 | + $question_grade = self::grade_gap_fill_question($question_id, $answer); |
|
| 882 | 882 | |
| 883 | - } else{ |
|
| 883 | + } else { |
|
| 884 | 884 | |
| 885 | 885 | /** |
| 886 | 886 | * Grading questions that are not auto gradable. |
@@ -893,7 +893,7 @@ discard block |
||
| 893 | 893 | * @param string $question_type one of the Sensei question type. |
| 894 | 894 | * @param string $answer user supplied question answer |
| 895 | 895 | */ |
| 896 | - $question_grade = ( int ) apply_filters( 'sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer ); |
|
| 896 | + $question_grade = (int) apply_filters('sensei_grade_question_auto', $question_grade, $question_id, $question_type, $answer); |
|
| 897 | 897 | |
| 898 | 898 | } // end if $question_type |
| 899 | 899 | |
@@ -909,13 +909,13 @@ discard block |
||
| 909 | 909 | * |
| 910 | 910 | * @return bool | int false or the grade given to the user answer |
| 911 | 911 | */ |
| 912 | - public static function grade_gap_fill_question( $question_id, $user_answer ){ |
|
| 912 | + public static function grade_gap_fill_question($question_id, $user_answer) { |
|
| 913 | 913 | |
| 914 | - $right_answer = get_post_meta( $question_id, '_question_right_answer', true ); |
|
| 915 | - $gapfill_array = explode( '||', $right_answer ); |
|
| 914 | + $right_answer = get_post_meta($question_id, '_question_right_answer', true); |
|
| 915 | + $gapfill_array = explode('||', $right_answer); |
|
| 916 | 916 | |
| 917 | - if( 0 == get_magic_quotes_gpc() ) { // deprecated from PHP 5.4 but we still support PHP 5.2 |
|
| 918 | - $user_answer = wp_unslash( $user_answer ); |
|
| 917 | + if (0 == get_magic_quotes_gpc()) { // deprecated from PHP 5.4 but we still support PHP 5.2 |
|
| 918 | + $user_answer = wp_unslash($user_answer); |
|
| 919 | 919 | } |
| 920 | 920 | |
| 921 | 921 | /** |
@@ -928,53 +928,53 @@ discard block |
||
| 928 | 928 | * |
| 929 | 929 | * @since 1.9.0 |
| 930 | 930 | */ |
| 931 | - $do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false ); |
|
| 931 | + $do_case_sensitive_comparison = apply_filters('sensei_gap_fill_case_sensitive_grading', false); |
|
| 932 | 932 | |
| 933 | - if( $do_case_sensitive_comparison ){ |
|
| 933 | + if ($do_case_sensitive_comparison) { |
|
| 934 | 934 | |
| 935 | 935 | // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer |
| 936 | - if ( trim(($gapfill_array[1])) == trim( $user_answer ) ) { |
|
| 936 | + if (trim(($gapfill_array[1])) == trim($user_answer)) { |
|
| 937 | 937 | |
| 938 | - return Sensei()->question->get_question_grade( $question_id ); |
|
| 938 | + return Sensei()->question->get_question_grade($question_id); |
|
| 939 | 939 | |
| 940 | - } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) { |
|
| 940 | + } else if (@preg_match('/'.$gapfill_array[1].'/i', null) !== FALSE) { |
|
| 941 | 941 | |
| 942 | - if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) { |
|
| 942 | + if (preg_match('/'.$gapfill_array[1].'/i', $user_answer)) { |
|
| 943 | 943 | |
| 944 | 944 | return Sensei()->question->get_question_grade($question_id); |
| 945 | 945 | |
| 946 | - }else{ |
|
| 946 | + } else { |
|
| 947 | 947 | |
| 948 | 948 | return false; |
| 949 | 949 | |
| 950 | 950 | } |
| 951 | 951 | |
| 952 | - }else{ |
|
| 952 | + } else { |
|
| 953 | 953 | |
| 954 | 954 | return false; |
| 955 | 955 | |
| 956 | 956 | } |
| 957 | 957 | |
| 958 | - }else{ |
|
| 958 | + } else { |
|
| 959 | 959 | |
| 960 | 960 | // Case Sensitive Check that the 'gap' is "exactly" equal to the given answer |
| 961 | - if ( trim(strtolower($gapfill_array[1])) == trim(strtolower( $user_answer )) ) { |
|
| 961 | + if (trim(strtolower($gapfill_array[1])) == trim(strtolower($user_answer))) { |
|
| 962 | 962 | |
| 963 | - return Sensei()->question->get_question_grade( $question_id ); |
|
| 963 | + return Sensei()->question->get_question_grade($question_id); |
|
| 964 | 964 | |
| 965 | - } else if (@preg_match('/' . $gapfill_array[1] . '/i', null) !== FALSE) { |
|
| 965 | + } else if (@preg_match('/'.$gapfill_array[1].'/i', null) !== FALSE) { |
|
| 966 | 966 | |
| 967 | - if (preg_match('/' . $gapfill_array[1] . '/i', $user_answer)) { |
|
| 967 | + if (preg_match('/'.$gapfill_array[1].'/i', $user_answer)) { |
|
| 968 | 968 | |
| 969 | - return Sensei()->question->get_question_grade( $question_id ); |
|
| 969 | + return Sensei()->question->get_question_grade($question_id); |
|
| 970 | 970 | |
| 971 | - }else{ |
|
| 971 | + } else { |
|
| 972 | 972 | |
| 973 | 973 | return false; |
| 974 | 974 | |
| 975 | 975 | } |
| 976 | 976 | |
| 977 | - }else{ |
|
| 977 | + } else { |
|
| 978 | 978 | |
| 979 | 979 | return false; |
| 980 | 980 | |
@@ -991,4 +991,4 @@ discard block |
||
| 991 | 991 | * @ignore only for backward compatibility |
| 992 | 992 | * @since 1.9.0 |
| 993 | 993 | */ |
| 994 | -class WooThemes_Sensei_Grading extends Sensei_Grading{} |
|
| 994 | +class WooThemes_Sensei_Grading extends Sensei_Grading {} |
|
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Analysis Overview Data Table. |
@@ -18,17 +18,17 @@ discard block |
||
| 18 | 18 | * @since 1.2.0 |
| 19 | 19 | * @return void |
| 20 | 20 | */ |
| 21 | - public function __construct ( $type = 'users' ) { |
|
| 22 | - $this->type = in_array( $type, array( 'courses', 'lessons', 'users' ) ) ? $type : 'users'; |
|
| 21 | + public function __construct($type = 'users') { |
|
| 22 | + $this->type = in_array($type, array('courses', 'lessons', 'users')) ? $type : 'users'; |
|
| 23 | 23 | |
| 24 | 24 | // Load Parent token into constructor |
| 25 | - parent::__construct( 'analysis_overview' ); |
|
| 25 | + parent::__construct('analysis_overview'); |
|
| 26 | 26 | |
| 27 | 27 | // Actions |
| 28 | - add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) ); |
|
| 29 | - add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) ); |
|
| 28 | + add_action('sensei_before_list_table', array($this, 'data_table_header')); |
|
| 29 | + add_action('sensei_after_list_table', array($this, 'data_table_footer')); |
|
| 30 | 30 | |
| 31 | - add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) ); |
|
| 31 | + add_filter('sensei_list_table_search_button_text', array($this, 'search_button')); |
|
| 32 | 32 | } // End __construct() |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -38,41 +38,41 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | function get_columns() { |
| 40 | 40 | |
| 41 | - switch( $this->type ) { |
|
| 41 | + switch ($this->type) { |
|
| 42 | 42 | case 'courses': |
| 43 | 43 | $columns = array( |
| 44 | - 'title' => __( 'Course', 'woothemes-sensei' ), |
|
| 45 | - 'students' => __( 'Learners', 'woothemes-sensei' ), |
|
| 46 | - 'lessons' => __( 'Lessons', 'woothemes-sensei' ), |
|
| 47 | - 'completions' => __( 'Completed', 'woothemes-sensei' ), |
|
| 48 | - 'average_percent' => __( 'Average Percentage', 'woothemes-sensei' ), |
|
| 44 | + 'title' => __('Course', 'woothemes-sensei'), |
|
| 45 | + 'students' => __('Learners', 'woothemes-sensei'), |
|
| 46 | + 'lessons' => __('Lessons', 'woothemes-sensei'), |
|
| 47 | + 'completions' => __('Completed', 'woothemes-sensei'), |
|
| 48 | + 'average_percent' => __('Average Percentage', 'woothemes-sensei'), |
|
| 49 | 49 | ); |
| 50 | 50 | break; |
| 51 | 51 | |
| 52 | 52 | case 'lessons': |
| 53 | 53 | $columns = array( |
| 54 | - 'title' => __( 'Lesson', 'woothemes-sensei' ), |
|
| 55 | - 'course' => __( 'Course', 'woothemes-sensei' ), |
|
| 56 | - 'students' => __( 'Learners', 'woothemes-sensei' ), |
|
| 57 | - 'completions' => __( 'Completed', 'woothemes-sensei' ), |
|
| 58 | - 'average_grade' => __( 'Average Grade', 'woothemes-sensei' ), |
|
| 54 | + 'title' => __('Lesson', 'woothemes-sensei'), |
|
| 55 | + 'course' => __('Course', 'woothemes-sensei'), |
|
| 56 | + 'students' => __('Learners', 'woothemes-sensei'), |
|
| 57 | + 'completions' => __('Completed', 'woothemes-sensei'), |
|
| 58 | + 'average_grade' => __('Average Grade', 'woothemes-sensei'), |
|
| 59 | 59 | ); |
| 60 | 60 | break; |
| 61 | 61 | |
| 62 | 62 | case 'users': |
| 63 | 63 | default: |
| 64 | 64 | $columns = array( |
| 65 | - 'title' => __( 'Learner', 'woothemes-sensei' ), |
|
| 66 | - 'registered' => __( 'Date Registered', 'woothemes-sensei' ), |
|
| 67 | - 'active_courses' => __( 'Active Courses', 'woothemes-sensei' ), |
|
| 68 | - 'completed_courses' => __( 'Completed Courses', 'woothemes-sensei' ), |
|
| 69 | - 'average_grade' => __( 'Average Grade', 'woothemes-sensei' ), |
|
| 65 | + 'title' => __('Learner', 'woothemes-sensei'), |
|
| 66 | + 'registered' => __('Date Registered', 'woothemes-sensei'), |
|
| 67 | + 'active_courses' => __('Active Courses', 'woothemes-sensei'), |
|
| 68 | + 'completed_courses' => __('Completed Courses', 'woothemes-sensei'), |
|
| 69 | + 'average_grade' => __('Average Grade', 'woothemes-sensei'), |
|
| 70 | 70 | ); |
| 71 | 71 | break; |
| 72 | 72 | } |
| 73 | 73 | // Backwards compatible filter name, moving forward should have single filter name |
| 74 | - $columns = apply_filters( 'sensei_analysis_overview_' . $this->type . '_columns', $columns, $this ); |
|
| 75 | - $columns = apply_filters( 'sensei_analysis_overview_columns', $columns, $this ); |
|
| 74 | + $columns = apply_filters('sensei_analysis_overview_'.$this->type.'_columns', $columns, $this); |
|
| 75 | + $columns = apply_filters('sensei_analysis_overview_columns', $columns, $this); |
|
| 76 | 76 | return $columns; |
| 77 | 77 | } |
| 78 | 78 | |
@@ -83,41 +83,41 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | function get_sortable_columns() { |
| 85 | 85 | |
| 86 | - switch( $this->type ) { |
|
| 86 | + switch ($this->type) { |
|
| 87 | 87 | case 'courses': |
| 88 | 88 | $columns = array( |
| 89 | - 'title' => array( 'title', false ), |
|
| 90 | - 'students' => array( 'students', false ), |
|
| 91 | - 'lessons' => array( 'lessons', false ), |
|
| 92 | - 'completions' => array( 'completions', false ), |
|
| 93 | - 'average_percent' => array( 'average_percent', false ), |
|
| 89 | + 'title' => array('title', false), |
|
| 90 | + 'students' => array('students', false), |
|
| 91 | + 'lessons' => array('lessons', false), |
|
| 92 | + 'completions' => array('completions', false), |
|
| 93 | + 'average_percent' => array('average_percent', false), |
|
| 94 | 94 | ); |
| 95 | 95 | break; |
| 96 | 96 | |
| 97 | 97 | case 'lessons': |
| 98 | 98 | $columns = array( |
| 99 | - 'title' => array( 'title', false ), |
|
| 100 | - 'course' => array( 'course', false ), |
|
| 101 | - 'students' => array( 'students', false ), |
|
| 102 | - 'completions' => array( 'completions', false ), |
|
| 103 | - 'average_grade' => array( 'average_grade', false ), |
|
| 99 | + 'title' => array('title', false), |
|
| 100 | + 'course' => array('course', false), |
|
| 101 | + 'students' => array('students', false), |
|
| 102 | + 'completions' => array('completions', false), |
|
| 103 | + 'average_grade' => array('average_grade', false), |
|
| 104 | 104 | ); |
| 105 | 105 | break; |
| 106 | 106 | |
| 107 | 107 | case 'users': |
| 108 | 108 | default: |
| 109 | 109 | $columns = array( |
| 110 | - 'title' => array( 'user_login', false ), |
|
| 111 | - 'registered' => array( 'registered', false ), |
|
| 112 | - 'active_courses' => array( 'active_courses', false ), |
|
| 113 | - 'completed_courses' => array( 'completed_courses', false ), |
|
| 114 | - 'average_grade' => array( 'average_grade', false ) |
|
| 110 | + 'title' => array('user_login', false), |
|
| 111 | + 'registered' => array('registered', false), |
|
| 112 | + 'active_courses' => array('active_courses', false), |
|
| 113 | + 'completed_courses' => array('completed_courses', false), |
|
| 114 | + 'average_grade' => array('average_grade', false) |
|
| 115 | 115 | ); |
| 116 | 116 | break; |
| 117 | 117 | } |
| 118 | 118 | // Backwards compatible filter name, moving forward should have single filter name |
| 119 | - $columns = apply_filters( 'sensei_analysis_overview_' . $this->type . '_columns_sortable', $columns, $this ); |
|
| 120 | - $columns = apply_filters( 'sensei_analysis_overview_columns_sortable', $columns, $this ); |
|
| 119 | + $columns = apply_filters('sensei_analysis_overview_'.$this->type.'_columns_sortable', $columns, $this); |
|
| 120 | + $columns = apply_filters('sensei_analysis_overview_columns_sortable', $columns, $this); |
|
| 121 | 121 | return $columns; |
| 122 | 122 | } |
| 123 | 123 | |
@@ -131,25 +131,25 @@ discard block |
||
| 131 | 131 | |
| 132 | 132 | // Handle orderby |
| 133 | 133 | $orderby = ''; |
| 134 | - if ( !empty( $_GET['orderby'] ) ) { |
|
| 135 | - if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) { |
|
| 136 | - $orderby = esc_html( $_GET['orderby'] ); |
|
| 134 | + if ( ! empty($_GET['orderby'])) { |
|
| 135 | + if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) { |
|
| 136 | + $orderby = esc_html($_GET['orderby']); |
|
| 137 | 137 | } // End If Statement |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | // Handle order |
| 141 | 141 | $order = 'ASC'; |
| 142 | - if ( !empty( $_GET['order'] ) ) { |
|
| 143 | - $order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC'; |
|
| 142 | + if ( ! empty($_GET['order'])) { |
|
| 143 | + $order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC'; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | - $per_page = $this->get_items_per_page( 'sensei_comments_per_page' ); |
|
| 147 | - $per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' ); |
|
| 146 | + $per_page = $this->get_items_per_page('sensei_comments_per_page'); |
|
| 147 | + $per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments'); |
|
| 148 | 148 | |
| 149 | 149 | $paged = $this->get_pagenum(); |
| 150 | 150 | $offset = 0; |
| 151 | - if ( !empty($paged) ) { |
|
| 152 | - $offset = $per_page * ( $paged - 1 ); |
|
| 151 | + if ( ! empty($paged)) { |
|
| 152 | + $offset = $per_page * ($paged - 1); |
|
| 153 | 153 | } // End If Statement |
| 154 | 154 | |
| 155 | 155 | $args = array( |
@@ -160,32 +160,32 @@ discard block |
||
| 160 | 160 | ); |
| 161 | 161 | |
| 162 | 162 | // Handle search |
| 163 | - if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) { |
|
| 164 | - $args['search'] = esc_html( $_GET['s'] ); |
|
| 163 | + if (isset($_GET['s']) && ! empty($_GET['s'])) { |
|
| 164 | + $args['search'] = esc_html($_GET['s']); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - switch ( $this->type ) { |
|
| 167 | + switch ($this->type) { |
|
| 168 | 168 | case 'courses': |
| 169 | - $this->items = $this->get_courses( $args ); |
|
| 169 | + $this->items = $this->get_courses($args); |
|
| 170 | 170 | break; |
| 171 | 171 | |
| 172 | 172 | case 'lessons': |
| 173 | - $this->items = $this->get_lessons( $args ); |
|
| 173 | + $this->items = $this->get_lessons($args); |
|
| 174 | 174 | break; |
| 175 | 175 | |
| 176 | 176 | case 'users': |
| 177 | 177 | default : |
| 178 | - $this->items = $this->get_learners( $args ); |
|
| 178 | + $this->items = $this->get_learners($args); |
|
| 179 | 179 | break; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | $total_items = $this->total_items; |
| 183 | - $total_pages = ceil( $total_items / $per_page ); |
|
| 184 | - $this->set_pagination_args( array( |
|
| 183 | + $total_pages = ceil($total_items / $per_page); |
|
| 184 | + $this->set_pagination_args(array( |
|
| 185 | 185 | 'total_items' => $total_items, |
| 186 | 186 | 'total_pages' => $total_pages, |
| 187 | 187 | 'per_page' => $per_page |
| 188 | - ) ); |
|
| 188 | + )); |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | /** |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | * @since 1.7.0 |
| 194 | 194 | * @return data |
| 195 | 195 | */ |
| 196 | - public function generate_report( $report ) { |
|
| 196 | + public function generate_report($report) { |
|
| 197 | 197 | |
| 198 | 198 | $data = array(); |
| 199 | 199 | |
@@ -201,16 +201,16 @@ discard block |
||
| 201 | 201 | |
| 202 | 202 | // Handle orderby |
| 203 | 203 | $orderby = ''; |
| 204 | - if ( !empty( $_GET['orderby'] ) ) { |
|
| 205 | - if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) { |
|
| 206 | - $orderby = esc_html( $_GET['orderby'] ); |
|
| 204 | + if ( ! empty($_GET['orderby'])) { |
|
| 205 | + if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) { |
|
| 206 | + $orderby = esc_html($_GET['orderby']); |
|
| 207 | 207 | } // End If Statement |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | // Handle order |
| 211 | 211 | $order = 'ASC'; |
| 212 | - if ( !empty( $_GET['order'] ) ) { |
|
| 213 | - $order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC'; |
|
| 212 | + if ( ! empty($_GET['order'])) { |
|
| 213 | + $order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC'; |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | $args = array( |
@@ -220,37 +220,37 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | |
| 222 | 222 | // Handle search |
| 223 | - if ( isset( $_GET['s'] ) && !empty( $_GET['s'] ) ) { |
|
| 224 | - $args['search'] = esc_html( $_GET['s'] ); |
|
| 223 | + if (isset($_GET['s']) && ! empty($_GET['s'])) { |
|
| 224 | + $args['search'] = esc_html($_GET['s']); |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | |
| 228 | 228 | // Start the csv with the column headings |
| 229 | 229 | $column_headers = array(); |
| 230 | 230 | $columns = $this->get_columns(); |
| 231 | - foreach( $columns AS $key => $title ) { |
|
| 231 | + foreach ($columns AS $key => $title) { |
|
| 232 | 232 | $column_headers[] = $title; |
| 233 | 233 | } |
| 234 | 234 | $data[] = $column_headers; |
| 235 | 235 | |
| 236 | - switch ( $this->type ) { |
|
| 236 | + switch ($this->type) { |
|
| 237 | 237 | case 'courses': |
| 238 | - $this->items = $this->get_courses( $args ); |
|
| 238 | + $this->items = $this->get_courses($args); |
|
| 239 | 239 | break; |
| 240 | 240 | |
| 241 | 241 | case 'lessons': |
| 242 | - $this->items = $this->get_lessons( $args ); |
|
| 242 | + $this->items = $this->get_lessons($args); |
|
| 243 | 243 | break; |
| 244 | 244 | |
| 245 | 245 | case 'users': |
| 246 | 246 | default : |
| 247 | - $this->items = $this->get_learners( $args ); |
|
| 247 | + $this->items = $this->get_learners($args); |
|
| 248 | 248 | break; |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | // Process each row |
| 252 | - foreach( $this->items AS $item) { |
|
| 253 | - $data[] = $this->get_row_data( $item ); |
|
| 252 | + foreach ($this->items AS $item) { |
|
| 253 | + $data[] = $this->get_row_data($item); |
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | return $data; |
@@ -262,9 +262,9 @@ discard block |
||
| 262 | 262 | * @param object $item The current item |
| 263 | 263 | * @return array $column_data; |
| 264 | 264 | */ |
| 265 | - protected function get_row_data( $item ) { |
|
| 265 | + protected function get_row_data($item) { |
|
| 266 | 266 | |
| 267 | - switch( $this->type ) { |
|
| 267 | + switch ($this->type) { |
|
| 268 | 268 | case 'courses' : |
| 269 | 269 | // Get Learners (i.e. those who have started) |
| 270 | 270 | $course_args = array( |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | 'type' => 'sensei_course_status', |
| 273 | 273 | 'status' => 'any', |
| 274 | 274 | ); |
| 275 | - $course_students = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_learners', $course_args, $item ) ); |
|
| 275 | + $course_students = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_learners', $course_args, $item)); |
|
| 276 | 276 | |
| 277 | 277 | // Get Course Completions |
| 278 | 278 | $course_args = array( |
@@ -280,10 +280,10 @@ discard block |
||
| 280 | 280 | 'type' => 'sensei_course_status', |
| 281 | 281 | 'status' => 'complete', |
| 282 | 282 | ); |
| 283 | - $course_completions = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_completions', $course_args, $item ) ); |
|
| 283 | + $course_completions = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_completions', $course_args, $item)); |
|
| 284 | 284 | |
| 285 | 285 | // Course Lessons |
| 286 | - $course_lessons = Sensei()->lesson->lesson_count( array('publish', 'private'), $item->ID ); |
|
| 286 | + $course_lessons = Sensei()->lesson->lesson_count(array('publish', 'private'), $item->ID); |
|
| 287 | 287 | |
| 288 | 288 | // Get Percent Complete |
| 289 | 289 | $grade_args = array( |
@@ -292,30 +292,30 @@ discard block |
||
| 292 | 292 | 'status' => 'any', |
| 293 | 293 | 'meta_key' => 'percent', |
| 294 | 294 | ); |
| 295 | - add_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 296 | - $course_percentage = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_course_percentage', $grade_args, $item ), true ); |
|
| 297 | - remove_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 295 | + add_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 296 | + $course_percentage = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_course_percentage', $grade_args, $item), true); |
|
| 297 | + remove_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 298 | 298 | |
| 299 | - $percent_count = !empty( $course_percentage->total ) ? $course_percentage->total : 1; |
|
| 300 | - $percent_total = !empty( $course_percentage->meta_sum ) ? doubleval( $course_percentage->meta_sum ) : 0; |
|
| 301 | - $course_average_percent = abs( round( doubleval( $percent_total / $percent_count ), 2 ) ); |
|
| 299 | + $percent_count = ! empty($course_percentage->total) ? $course_percentage->total : 1; |
|
| 300 | + $percent_total = ! empty($course_percentage->meta_sum) ? doubleval($course_percentage->meta_sum) : 0; |
|
| 301 | + $course_average_percent = abs(round(doubleval($percent_total / $percent_count), 2)); |
|
| 302 | 302 | |
| 303 | 303 | // Output course data |
| 304 | - if ( $this->csv_output ) { |
|
| 305 | - $course_title = apply_filters( 'the_title', $item->post_title, $item->ID ); |
|
| 304 | + if ($this->csv_output) { |
|
| 305 | + $course_title = apply_filters('the_title', $item->post_title, $item->ID); |
|
| 306 | 306 | } |
| 307 | 307 | else { |
| 308 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $item->ID ), admin_url( 'admin.php' ) ); |
|
| 308 | + $url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $item->ID), admin_url('admin.php')); |
|
| 309 | 309 | |
| 310 | - $course_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>'; |
|
| 310 | + $course_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>'; |
|
| 311 | 311 | $course_average_percent .= '%'; |
| 312 | 312 | } // End If Statement |
| 313 | - $column_data = apply_filters( 'sensei_analysis_overview_column_data', array( 'title' => $course_title, |
|
| 313 | + $column_data = apply_filters('sensei_analysis_overview_column_data', array('title' => $course_title, |
|
| 314 | 314 | 'students' => $course_students, |
| 315 | 315 | 'lessons' => $course_lessons, |
| 316 | 316 | 'completions' => $course_completions, |
| 317 | 317 | 'average_percent' => $course_average_percent, |
| 318 | - ), $item, $this ); |
|
| 318 | + ), $item, $this); |
|
| 319 | 319 | break; |
| 320 | 320 | |
| 321 | 321 | case 'lessons' : |
@@ -325,63 +325,63 @@ discard block |
||
| 325 | 325 | 'type' => 'sensei_lesson_status', |
| 326 | 326 | 'status' => 'any', |
| 327 | 327 | ); |
| 328 | - $lesson_students = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_learners', $lesson_args, $item ) ); |
|
| 328 | + $lesson_students = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_learners', $lesson_args, $item)); |
|
| 329 | 329 | |
| 330 | 330 | // Get Course Completions |
| 331 | 331 | $lesson_args = array( |
| 332 | 332 | 'post_id' => $item->ID, |
| 333 | 333 | 'type' => 'sensei_lesson_status', |
| 334 | - 'status' => array( 'complete', 'graded', 'passed', 'failed' ), |
|
| 334 | + 'status' => array('complete', 'graded', 'passed', 'failed'), |
|
| 335 | 335 | 'count' => true, |
| 336 | 336 | ); |
| 337 | - $lesson_completions = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_completions', $lesson_args, $item ) ); |
|
| 337 | + $lesson_completions = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_completions', $lesson_args, $item)); |
|
| 338 | 338 | |
| 339 | 339 | // Course |
| 340 | - $course_id = get_post_meta( $item->ID, '_lesson_course', true ); |
|
| 341 | - $course_title = $course_id ? get_the_title( $course_id ) : ''; |
|
| 340 | + $course_id = get_post_meta($item->ID, '_lesson_course', true); |
|
| 341 | + $course_title = $course_id ? get_the_title($course_id) : ''; |
|
| 342 | 342 | |
| 343 | 343 | $lesson_average_grade = __('n/a', 'woothemes-sensei'); |
| 344 | - if ( false != get_post_meta($item->ID, '_quiz_has_questions', true) ) { |
|
| 344 | + if (false != get_post_meta($item->ID, '_quiz_has_questions', true)) { |
|
| 345 | 345 | // Get Percent Complete |
| 346 | 346 | $grade_args = array( |
| 347 | 347 | 'post_id' => $item->ID, |
| 348 | 348 | 'type' => 'sensei_lesson_status', |
| 349 | - 'status' => array( 'graded', 'passed', 'failed' ), |
|
| 349 | + 'status' => array('graded', 'passed', 'failed'), |
|
| 350 | 350 | 'meta_key' => 'grade', |
| 351 | 351 | ); |
| 352 | - add_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 353 | - $lesson_grades = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_lesson_grades', $grade_args, $item ), true ); |
|
| 354 | - remove_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 352 | + add_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 353 | + $lesson_grades = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_lesson_grades', $grade_args, $item), true); |
|
| 354 | + remove_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 355 | 355 | |
| 356 | - $grade_count = !empty( $lesson_grades->total ) ? $lesson_grades->total : 1; |
|
| 357 | - $grade_total = !empty( $lesson_grades->meta_sum ) ? doubleval( $lesson_grades->meta_sum ) : 0; |
|
| 358 | - $lesson_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) ); |
|
| 356 | + $grade_count = ! empty($lesson_grades->total) ? $lesson_grades->total : 1; |
|
| 357 | + $grade_total = ! empty($lesson_grades->meta_sum) ? doubleval($lesson_grades->meta_sum) : 0; |
|
| 358 | + $lesson_average_grade = abs(round(doubleval($grade_total / $grade_count), 2)); |
|
| 359 | 359 | } |
| 360 | 360 | // Output lesson data |
| 361 | - if ( $this->csv_output ) { |
|
| 362 | - $lesson_title = apply_filters( 'the_title', $item->post_title, $item->ID ); |
|
| 361 | + if ($this->csv_output) { |
|
| 362 | + $lesson_title = apply_filters('the_title', $item->post_title, $item->ID); |
|
| 363 | 363 | } |
| 364 | 364 | else { |
| 365 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'lesson_id' => $item->ID ), admin_url( 'admin.php' ) ); |
|
| 366 | - $lesson_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . apply_filters( 'the_title', $item->post_title, $item->ID ) . '</a></strong>'; |
|
| 365 | + $url = add_query_arg(array('page' => $this->page_slug, 'lesson_id' => $item->ID), admin_url('admin.php')); |
|
| 366 | + $lesson_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.apply_filters('the_title', $item->post_title, $item->ID).'</a></strong>'; |
|
| 367 | 367 | |
| 368 | - if ( $course_id ) { |
|
| 369 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'course_id' => $course_id ), admin_url( 'admin.php' ) ); |
|
| 370 | - $course_title = '<a href="' . esc_url( $url ) . '">' . $course_title . '</a>'; |
|
| 368 | + if ($course_id) { |
|
| 369 | + $url = add_query_arg(array('page' => $this->page_slug, 'course_id' => $course_id), admin_url('admin.php')); |
|
| 370 | + $course_title = '<a href="'.esc_url($url).'">'.$course_title.'</a>'; |
|
| 371 | 371 | } |
| 372 | 372 | else { |
| 373 | 373 | $course_title = __('n/a', 'woothemes-sensei'); |
| 374 | 374 | } |
| 375 | - if ( is_numeric( $lesson_average_grade ) ) { |
|
| 375 | + if (is_numeric($lesson_average_grade)) { |
|
| 376 | 376 | $lesson_average_grade .= '%'; |
| 377 | 377 | } |
| 378 | 378 | } // End If Statement |
| 379 | - $column_data = apply_filters( 'sensei_analysis_overview_column_data', array( 'title' => $lesson_title, |
|
| 379 | + $column_data = apply_filters('sensei_analysis_overview_column_data', array('title' => $lesson_title, |
|
| 380 | 380 | 'course' => $course_title, |
| 381 | 381 | 'students' => $lesson_students, |
| 382 | 382 | 'completions' => $lesson_completions, |
| 383 | 383 | 'average_grade' => $lesson_average_grade, |
| 384 | - ), $item, $this ); |
|
| 384 | + ), $item, $this); |
|
| 385 | 385 | break; |
| 386 | 386 | |
| 387 | 387 | case 'users' : |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | 'type' => 'sensei_course_status', |
| 393 | 393 | 'status' => 'any', |
| 394 | 394 | ); |
| 395 | - $user_courses_started = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_courses_started', $course_args, $item ) ); |
|
| 395 | + $user_courses_started = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_user_courses_started', $course_args, $item)); |
|
| 396 | 396 | |
| 397 | 397 | // Get Completed Courses |
| 398 | 398 | $course_args = array( |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | 'type' => 'sensei_course_status', |
| 401 | 401 | 'status' => 'complete', |
| 402 | 402 | ); |
| 403 | - $user_courses_ended = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_courses_ended', $course_args, $item ) ); |
|
| 403 | + $user_courses_ended = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_user_courses_ended', $course_args, $item)); |
|
| 404 | 404 | |
| 405 | 405 | // Get Quiz Grades |
| 406 | 406 | $grade_args = array( |
@@ -409,29 +409,29 @@ discard block |
||
| 409 | 409 | 'status' => 'any', |
| 410 | 410 | 'meta_key' => 'grade', |
| 411 | 411 | ); |
| 412 | - add_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 413 | - $user_quiz_grades = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_user_lesson_grades', $grade_args, $item ), true ); |
|
| 414 | - remove_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 412 | + add_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 413 | + $user_quiz_grades = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_user_lesson_grades', $grade_args, $item), true); |
|
| 414 | + remove_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 415 | 415 | |
| 416 | - $grade_count = !empty( $user_quiz_grades->total ) ? $user_quiz_grades->total : 1; |
|
| 417 | - $grade_total = !empty( $user_quiz_grades->meta_sum ) ? doubleval( $user_quiz_grades->meta_sum ) : 0; |
|
| 418 | - $user_average_grade = abs( round( doubleval( $grade_total / $grade_count ), 2 ) ); |
|
| 416 | + $grade_count = ! empty($user_quiz_grades->total) ? $user_quiz_grades->total : 1; |
|
| 417 | + $grade_total = ! empty($user_quiz_grades->meta_sum) ? doubleval($user_quiz_grades->meta_sum) : 0; |
|
| 418 | + $user_average_grade = abs(round(doubleval($grade_total / $grade_count), 2)); |
|
| 419 | 419 | |
| 420 | 420 | // Output the users data |
| 421 | - if ( $this->csv_output ) { |
|
| 422 | - $user_name = Sensei_Learner::get_full_name( $item->ID ); |
|
| 421 | + if ($this->csv_output) { |
|
| 422 | + $user_name = Sensei_Learner::get_full_name($item->ID); |
|
| 423 | 423 | } |
| 424 | 424 | else { |
| 425 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $item->ID ), admin_url( 'admin.php' ) ); |
|
| 426 | - $user_name = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $item->display_name . '</a></strong>'; |
|
| 425 | + $url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $item->ID), admin_url('admin.php')); |
|
| 426 | + $user_name = '<strong><a class="row-title" href="'.esc_url($url).'">'.$item->display_name.'</a></strong>'; |
|
| 427 | 427 | $user_average_grade .= '%'; |
| 428 | 428 | } // End If Statement |
| 429 | - $column_data = apply_filters( 'sensei_analysis_overview_column_data', array( 'title' => $user_name, |
|
| 429 | + $column_data = apply_filters('sensei_analysis_overview_column_data', array('title' => $user_name, |
|
| 430 | 430 | 'registered' => $item->user_registered, |
| 431 | - 'active_courses' => ( $user_courses_started - $user_courses_ended ), |
|
| 431 | + 'active_courses' => ($user_courses_started - $user_courses_ended), |
|
| 432 | 432 | 'completed_courses' => $user_courses_ended, |
| 433 | 433 | 'average_grade' => $user_average_grade, |
| 434 | - ), $item, $this ); |
|
| 434 | + ), $item, $this); |
|
| 435 | 435 | break; |
| 436 | 436 | } // end switch |
| 437 | 437 | return $column_data; |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | * @since 1.7.0 |
| 443 | 443 | * @return array courses |
| 444 | 444 | */ |
| 445 | - private function get_courses( $args ) { |
|
| 445 | + private function get_courses($args) { |
|
| 446 | 446 | $course_args = array( |
| 447 | 447 | 'post_type' => 'course', |
| 448 | 448 | 'post_status' => array('publish', 'private'), |
@@ -453,16 +453,16 @@ discard block |
||
| 453 | 453 | 'suppress_filters' => 0, |
| 454 | 454 | ); |
| 455 | 455 | |
| 456 | - if ( $this->csv_output ) { |
|
| 456 | + if ($this->csv_output) { |
|
| 457 | 457 | $course_args['posts_per_page'] = '-1'; |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | - if( isset( $args['search'] ) ) { |
|
| 460 | + if (isset($args['search'])) { |
|
| 461 | 461 | $course_args['s'] = $args['search']; |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | 464 | // Using WP_Query as get_posts() doesn't support 'found_posts' |
| 465 | - $courses_query = new WP_Query( apply_filters( 'sensei_analysis_overview_filter_courses', $course_args ) ); |
|
| 465 | + $courses_query = new WP_Query(apply_filters('sensei_analysis_overview_filter_courses', $course_args)); |
|
| 466 | 466 | $this->total_items = $courses_query->found_posts; |
| 467 | 467 | return $courses_query->posts; |
| 468 | 468 | |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | * @since 1.7.0 |
| 474 | 474 | * @return array lessons |
| 475 | 475 | */ |
| 476 | - private function get_lessons( $args ) { |
|
| 476 | + private function get_lessons($args) { |
|
| 477 | 477 | $lessons_args = array( |
| 478 | 478 | 'post_type' => 'lesson', |
| 479 | 479 | 'post_status' => array('publish', 'private'), |
@@ -484,16 +484,16 @@ discard block |
||
| 484 | 484 | 'suppress_filters' => 0, |
| 485 | 485 | ); |
| 486 | 486 | |
| 487 | - if ( $this->csv_output ) { |
|
| 487 | + if ($this->csv_output) { |
|
| 488 | 488 | $lessons_args['posts_per_page'] = '-1'; |
| 489 | 489 | } |
| 490 | 490 | |
| 491 | - if( isset( $args['search'] ) ) { |
|
| 491 | + if (isset($args['search'])) { |
|
| 492 | 492 | $lessons_args['s'] = $args['search']; |
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | // Using WP_Query as get_posts() doesn't support 'found_posts' |
| 496 | - $lessons_query = new WP_Query( apply_filters( 'sensei_analysis_overview_filter_lessons', $lessons_args ) ); |
|
| 496 | + $lessons_query = new WP_Query(apply_filters('sensei_analysis_overview_filter_lessons', $lessons_args)); |
|
| 497 | 497 | $this->total_items = $lessons_query->found_posts; |
| 498 | 498 | return $lessons_query->posts; |
| 499 | 499 | } // End get_lessons() |
@@ -503,24 +503,24 @@ discard block |
||
| 503 | 503 | * @since 1.7.0 |
| 504 | 504 | * @return array learners |
| 505 | 505 | */ |
| 506 | - private function get_learners( $args ) { |
|
| 506 | + private function get_learners($args) { |
|
| 507 | 507 | |
| 508 | - if ( !empty($args['search']) ) { |
|
| 508 | + if ( ! empty($args['search'])) { |
|
| 509 | 509 | $args = array( |
| 510 | - 'search' => '*' . trim( $args['search'], '*' ) . '*', |
|
| 510 | + 'search' => '*'.trim($args['search'], '*').'*', |
|
| 511 | 511 | ); |
| 512 | 512 | } |
| 513 | 513 | |
| 514 | 514 | // This stops the full meta data of each user being loaded |
| 515 | - $args['fields'] = array( 'ID', 'user_login', 'user_email', 'user_registered', 'display_name' ); |
|
| 515 | + $args['fields'] = array('ID', 'user_login', 'user_email', 'user_registered', 'display_name'); |
|
| 516 | 516 | |
| 517 | 517 | /** |
| 518 | 518 | * Filter the WP_User_Query arguments |
| 519 | 519 | * @since 1.6.0 |
| 520 | 520 | * @param $args |
| 521 | 521 | */ |
| 522 | - $args = apply_filters( 'sensei_analysis_overview_filter_users', $args ); |
|
| 523 | - $wp_user_search = new WP_User_Query( $args ); |
|
| 522 | + $args = apply_filters('sensei_analysis_overview_filter_users', $args); |
|
| 523 | + $wp_user_search = new WP_User_Query($args); |
|
| 524 | 524 | $learners = $wp_user_search->get_results(); |
| 525 | 525 | $this->total_items = $wp_user_search->get_total(); |
| 526 | 526 | |
@@ -533,13 +533,13 @@ discard block |
||
| 533 | 533 | * @since 1.2.0 |
| 534 | 534 | * @return array $stats_to_render of stats boxes and values |
| 535 | 535 | */ |
| 536 | - public function stats_boxes () { |
|
| 536 | + public function stats_boxes() { |
|
| 537 | 537 | |
| 538 | 538 | // Get the data required |
| 539 | 539 | $user_count = count_users(); |
| 540 | - $user_count = apply_filters( 'sensei_analysis_total_users', $user_count['total_users'], $user_count ); |
|
| 541 | - $total_courses = Sensei()->course->course_count( array('publish', 'private') ); |
|
| 542 | - $total_lessons = Sensei()->lesson->lesson_count( array('publish', 'private') ); |
|
| 540 | + $user_count = apply_filters('sensei_analysis_total_users', $user_count['total_users'], $user_count); |
|
| 541 | + $total_courses = Sensei()->course->course_count(array('publish', 'private')); |
|
| 542 | + $total_lessons = Sensei()->lesson->lesson_count(array('publish', 'private')); |
|
| 543 | 543 | |
| 544 | 544 | $grade_args = array( |
| 545 | 545 | 'type' => 'sensei_lesson_status', |
@@ -547,36 +547,36 @@ discard block |
||
| 547 | 547 | 'meta_key' => 'grade', |
| 548 | 548 | ); |
| 549 | 549 | |
| 550 | - add_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 551 | - $total_quiz_grades = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_total_quiz_grades', $grade_args ), true ); |
|
| 552 | - remove_filter( 'comments_clauses', array( 'WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter' ) ); |
|
| 550 | + add_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 551 | + $total_quiz_grades = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_total_quiz_grades', $grade_args), true); |
|
| 552 | + remove_filter('comments_clauses', array('WooThemes_Sensei_Utils', 'comment_total_sum_meta_value_filter')); |
|
| 553 | 553 | |
| 554 | - $total_grade_count = !empty( $total_quiz_grades->total ) ? $total_quiz_grades->total : 1; |
|
| 555 | - $total_grade_total = !empty( $total_quiz_grades->meta_sum ) ? doubleval( $total_quiz_grades->meta_sum ) : 0; |
|
| 556 | - $total_average_grade = abs( round( doubleval( $total_grade_total / $total_grade_count ), 2 ) ); |
|
| 554 | + $total_grade_count = ! empty($total_quiz_grades->total) ? $total_quiz_grades->total : 1; |
|
| 555 | + $total_grade_total = ! empty($total_quiz_grades->meta_sum) ? doubleval($total_quiz_grades->meta_sum) : 0; |
|
| 556 | + $total_average_grade = abs(round(doubleval($total_grade_total / $total_grade_count), 2)); |
|
| 557 | 557 | |
| 558 | 558 | $course_args = array( |
| 559 | 559 | 'type' => 'sensei_course_status', |
| 560 | 560 | 'status' => 'any', |
| 561 | 561 | ); |
| 562 | - $total_courses_started = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_total_courses_started', $course_args ) ); |
|
| 562 | + $total_courses_started = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_total_courses_started', $course_args)); |
|
| 563 | 563 | $course_args = array( |
| 564 | 564 | 'type' => 'sensei_course_status', |
| 565 | 565 | 'status' => 'complete', |
| 566 | 566 | ); |
| 567 | - $total_courses_ended = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_analysis_total_courses_ended', $course_args ) ); |
|
| 568 | - $average_courses_per_learner = abs( round( doubleval( $total_courses_started / $user_count ), 2 ) ); |
|
| 567 | + $total_courses_ended = Sensei_Utils::sensei_check_for_activity(apply_filters('sensei_analysis_total_courses_ended', $course_args)); |
|
| 568 | + $average_courses_per_learner = abs(round(doubleval($total_courses_started / $user_count), 2)); |
|
| 569 | 569 | |
| 570 | 570 | // Setup the boxes to render |
| 571 | 571 | $stats_to_render = array( |
| 572 | - __( 'Total Courses', 'woothemes-sensei' ) => $total_courses, |
|
| 573 | - __( 'Total Lessons', 'woothemes-sensei' ) => $total_lessons, |
|
| 574 | - __( 'Total Learners', 'woothemes-sensei' ) => $user_count, |
|
| 575 | - __( 'Average Courses per Learner', 'woothemes-sensei' ) => $average_courses_per_learner, |
|
| 576 | - __( 'Average Grade', 'woothemes-sensei' ) => $total_average_grade . '%', |
|
| 577 | - __( 'Total Completed Courses', 'woothemes-sensei' ) => $total_courses_ended, |
|
| 572 | + __('Total Courses', 'woothemes-sensei') => $total_courses, |
|
| 573 | + __('Total Lessons', 'woothemes-sensei') => $total_lessons, |
|
| 574 | + __('Total Learners', 'woothemes-sensei') => $user_count, |
|
| 575 | + __('Average Courses per Learner', 'woothemes-sensei') => $average_courses_per_learner, |
|
| 576 | + __('Average Grade', 'woothemes-sensei') => $total_average_grade.'%', |
|
| 577 | + __('Total Completed Courses', 'woothemes-sensei') => $total_courses_ended, |
|
| 578 | 578 | ); |
| 579 | - return apply_filters( 'sensei_analysis_stats_boxes', $stats_to_render ); |
|
| 579 | + return apply_filters('sensei_analysis_stats_boxes', $stats_to_render); |
|
| 580 | 580 | } // End stats_boxes() |
| 581 | 581 | |
| 582 | 582 | /** |
@@ -586,12 +586,12 @@ discard block |
||
| 586 | 586 | * @return void |
| 587 | 587 | */ |
| 588 | 588 | public function no_items() { |
| 589 | - if( ! $this->view || 'users' == $this->view ) { |
|
| 589 | + if ( ! $this->view || 'users' == $this->view) { |
|
| 590 | 590 | $type = 'learners'; |
| 591 | 591 | } else { |
| 592 | 592 | $type = $this->view; |
| 593 | 593 | } |
| 594 | - echo sprintf( __( '%1$sNo %2$s found%3$s', 'woothemes-sensei' ), '<em>', $type, '</em>' ); |
|
| 594 | + echo sprintf(__('%1$sNo %2$s found%3$s', 'woothemes-sensei'), '<em>', $type, '</em>'); |
|
| 595 | 595 | } // End no_items() |
| 596 | 596 | |
| 597 | 597 | /** |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | 'page' => $this->page_slug, |
| 607 | 607 | ); |
| 608 | 608 | $learners_class = $courses_class = $lessons_class = ''; |
| 609 | - switch( $this->type ) { |
|
| 609 | + switch ($this->type) { |
|
| 610 | 610 | case 'courses': |
| 611 | 611 | $courses_class = 'current'; |
| 612 | 612 | break; |
@@ -624,18 +624,18 @@ discard block |
||
| 624 | 624 | $lesson_args['view'] = 'lessons'; |
| 625 | 625 | $courses_args['view'] = 'courses'; |
| 626 | 626 | |
| 627 | - $menu['learners'] = '<a class="' . $learners_class . '" href="' . esc_url( add_query_arg( $learner_args, admin_url( 'admin.php' ) ) ). '">' . __( 'Learners', 'woothemes-sensei' ) . '</a>'; |
|
| 628 | - $menu['courses'] = '<a class="' . $courses_class . '" href="' . esc_url ( add_query_arg( $courses_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Courses', 'woothemes-sensei' ) . '</a>'; |
|
| 629 | - $menu['lessons'] = '<a class="' . $lessons_class . '" href="' . esc_url( add_query_arg( $lesson_args, admin_url( 'admin.php' ) ) ) . '">' . __( 'Lessons', 'woothemes-sensei' ) . '</a>'; |
|
| 627 | + $menu['learners'] = '<a class="'.$learners_class.'" href="'.esc_url(add_query_arg($learner_args, admin_url('admin.php'))).'">'.__('Learners', 'woothemes-sensei').'</a>'; |
|
| 628 | + $menu['courses'] = '<a class="'.$courses_class.'" href="'.esc_url(add_query_arg($courses_args, admin_url('admin.php'))).'">'.__('Courses', 'woothemes-sensei').'</a>'; |
|
| 629 | + $menu['lessons'] = '<a class="'.$lessons_class.'" href="'.esc_url(add_query_arg($lesson_args, admin_url('admin.php'))).'">'.__('Lessons', 'woothemes-sensei').'</a>'; |
|
| 630 | 630 | |
| 631 | - $menu = apply_filters( 'sensei_analysis_overview_sub_menu', $menu ); |
|
| 632 | - if ( !empty($menu) ) { |
|
| 633 | - echo '<ul class="subsubsub">' . "\n"; |
|
| 634 | - foreach ( $menu as $class => $item ) { |
|
| 635 | - $menu[ $class ] = "\t<li class='$class'>$item"; |
|
| 631 | + $menu = apply_filters('sensei_analysis_overview_sub_menu', $menu); |
|
| 632 | + if ( ! empty($menu)) { |
|
| 633 | + echo '<ul class="subsubsub">'."\n"; |
|
| 634 | + foreach ($menu as $class => $item) { |
|
| 635 | + $menu[$class] = "\t<li class='$class'>$item"; |
|
| 636 | 636 | } |
| 637 | - echo implode( " |</li>\n", $menu ) . "</li>\n"; |
|
| 638 | - echo '</ul>' . "\n"; |
|
| 637 | + echo implode(" |</li>\n", $menu)."</li>\n"; |
|
| 638 | + echo '</ul>'."\n"; |
|
| 639 | 639 | } |
| 640 | 640 | } // End data_table_header() |
| 641 | 641 | |
@@ -645,7 +645,7 @@ discard block |
||
| 645 | 645 | * @return void |
| 646 | 646 | */ |
| 647 | 647 | public function data_table_footer() { |
| 648 | - switch ( $this->type ) { |
|
| 648 | + switch ($this->type) { |
|
| 649 | 649 | case 'courses': |
| 650 | 650 | $report = 'courses-overview'; |
| 651 | 651 | break; |
@@ -659,8 +659,8 @@ discard block |
||
| 659 | 659 | $report = 'user-overview'; |
| 660 | 660 | break; |
| 661 | 661 | } // End Switch Statement |
| 662 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'view' => $this->type, 'sensei_report_download' => $report ), admin_url( 'admin.php' ) ); |
|
| 663 | - echo '<a class="button button-primary" href="' . esc_url( wp_nonce_url( $url, 'sensei_csv_download-' . $report, '_sdl_nonce' ) ) . '">' . __( 'Export all rows (CSV)', 'woothemes-sensei' ) . '</a>'; |
|
| 662 | + $url = add_query_arg(array('page' => $this->page_slug, 'view' => $this->type, 'sensei_report_download' => $report), admin_url('admin.php')); |
|
| 663 | + echo '<a class="button button-primary" href="'.esc_url(wp_nonce_url($url, 'sensei_csv_download-'.$report, '_sdl_nonce')).'">'.__('Export all rows (CSV)', 'woothemes-sensei').'</a>'; |
|
| 664 | 664 | } // End data_table_footer() |
| 665 | 665 | |
| 666 | 666 | /** |
@@ -668,19 +668,19 @@ discard block |
||
| 668 | 668 | * @since 1.7.0 |
| 669 | 669 | * @return string $text |
| 670 | 670 | */ |
| 671 | - public function search_button( $text = '' ) { |
|
| 672 | - switch( $this->type ) { |
|
| 671 | + public function search_button($text = '') { |
|
| 672 | + switch ($this->type) { |
|
| 673 | 673 | case 'courses': |
| 674 | - $text = __( 'Search Courses', 'woothemes-sensei' ); |
|
| 674 | + $text = __('Search Courses', 'woothemes-sensei'); |
|
| 675 | 675 | break; |
| 676 | 676 | |
| 677 | 677 | case 'lessons': |
| 678 | - $text = __( 'Search Lessons', 'woothemes-sensei' ); |
|
| 678 | + $text = __('Search Lessons', 'woothemes-sensei'); |
|
| 679 | 679 | break; |
| 680 | 680 | |
| 681 | 681 | case 'users': |
| 682 | 682 | default: |
| 683 | - $text = __( 'Search Learners', 'woothemes-sensei' ); |
|
| 683 | + $text = __('Search Learners', 'woothemes-sensei'); |
|
| 684 | 684 | break; |
| 685 | 685 | } // End Switch Statement |
| 686 | 686 | |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Analysis User Profile Data Table in Sensei. |
@@ -18,17 +18,17 @@ discard block |
||
| 18 | 18 | * @since 1.2.0 |
| 19 | 19 | * @return void |
| 20 | 20 | */ |
| 21 | - public function __construct ( $user_id = 0 ) { |
|
| 22 | - $this->user_id = intval( $user_id ); |
|
| 21 | + public function __construct($user_id = 0) { |
|
| 22 | + $this->user_id = intval($user_id); |
|
| 23 | 23 | |
| 24 | 24 | // Load Parent token into constructor |
| 25 | - parent::__construct( 'analysis_user_profile' ); |
|
| 25 | + parent::__construct('analysis_user_profile'); |
|
| 26 | 26 | |
| 27 | 27 | // Actions |
| 28 | - add_action( 'sensei_before_list_table', array( $this, 'data_table_header' ) ); |
|
| 29 | - add_action( 'sensei_after_list_table', array( $this, 'data_table_footer' ) ); |
|
| 28 | + add_action('sensei_before_list_table', array($this, 'data_table_header')); |
|
| 29 | + add_action('sensei_after_list_table', array($this, 'data_table_footer')); |
|
| 30 | 30 | |
| 31 | - add_filter( 'sensei_list_table_search_button_text', array( $this, 'search_button' ) ); |
|
| 31 | + add_filter('sensei_list_table_search_button_text', array($this, 'search_button')); |
|
| 32 | 32 | } // End __construct() |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -38,14 +38,14 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | function get_columns() { |
| 40 | 40 | $columns = array( |
| 41 | - 'title' => __( 'Course', 'woothemes-sensei' ), |
|
| 42 | - 'started' => __( 'Date Started', 'woothemes-sensei' ), |
|
| 43 | - 'completed' => __( 'Date Completed', 'woothemes-sensei' ), |
|
| 44 | - 'status' => __( 'Status', 'woothemes-sensei' ), |
|
| 41 | + 'title' => __('Course', 'woothemes-sensei'), |
|
| 42 | + 'started' => __('Date Started', 'woothemes-sensei'), |
|
| 43 | + 'completed' => __('Date Completed', 'woothemes-sensei'), |
|
| 44 | + 'status' => __('Status', 'woothemes-sensei'), |
|
| 45 | 45 | // 'grade' => __( 'Grade', 'woothemes-sensei' ), |
| 46 | - 'percent' => __( 'Percent Complete', 'woothemes-sensei' ), |
|
| 46 | + 'percent' => __('Percent Complete', 'woothemes-sensei'), |
|
| 47 | 47 | ); |
| 48 | - $columns = apply_filters( 'sensei_analysis_user_profile_columns', $columns ); |
|
| 48 | + $columns = apply_filters('sensei_analysis_user_profile_columns', $columns); |
|
| 49 | 49 | return $columns; |
| 50 | 50 | } |
| 51 | 51 | |
@@ -56,14 +56,14 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | function get_sortable_columns() { |
| 58 | 58 | $columns = array( |
| 59 | - 'title' => array( 'title', false ), |
|
| 60 | - 'started' => array( 'started', false ), |
|
| 61 | - 'completed' => array( 'completed', false ), |
|
| 62 | - 'status' => array( 'status', false ), |
|
| 59 | + 'title' => array('title', false), |
|
| 60 | + 'started' => array('started', false), |
|
| 61 | + 'completed' => array('completed', false), |
|
| 62 | + 'status' => array('status', false), |
|
| 63 | 63 | // 'grade' => array( 'grade', false ), |
| 64 | - 'percent' => array( 'percent', false ) |
|
| 64 | + 'percent' => array('percent', false) |
|
| 65 | 65 | ); |
| 66 | - $columns = apply_filters( 'sensei_analysis_user_profile_columns_sortable', $columns ); |
|
| 66 | + $columns = apply_filters('sensei_analysis_user_profile_columns_sortable', $columns); |
|
| 67 | 67 | return $columns; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -77,32 +77,32 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | // Handle orderby (needs work) |
| 79 | 79 | $orderby = ''; |
| 80 | - if ( !empty( $_GET['orderby'] ) ) { |
|
| 81 | - if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) { |
|
| 82 | - $orderby = esc_html( $_GET['orderby'] ); |
|
| 80 | + if ( ! empty($_GET['orderby'])) { |
|
| 81 | + if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) { |
|
| 82 | + $orderby = esc_html($_GET['orderby']); |
|
| 83 | 83 | } // End If Statement |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | // Handle order |
| 87 | 87 | $order = 'ASC'; |
| 88 | - if ( !empty( $_GET['order'] ) ) { |
|
| 89 | - $order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC'; |
|
| 88 | + if ( ! empty($_GET['order'])) { |
|
| 89 | + $order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC'; |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | // Handle search, need 4.1 version of WP to be able to restrict statuses to known post_ids |
| 93 | 93 | $search = false; |
| 94 | - if ( !empty( $_GET['s'] ) ) { |
|
| 95 | - $search = esc_html( $_GET['s'] ); |
|
| 94 | + if ( ! empty($_GET['s'])) { |
|
| 95 | + $search = esc_html($_GET['s']); |
|
| 96 | 96 | } // End If Statement |
| 97 | 97 | $this->search = $search; |
| 98 | 98 | |
| 99 | - $per_page = $this->get_items_per_page( 'sensei_comments_per_page' ); |
|
| 100 | - $per_page = apply_filters( 'sensei_comments_per_page', $per_page, 'sensei_comments' ); |
|
| 99 | + $per_page = $this->get_items_per_page('sensei_comments_per_page'); |
|
| 100 | + $per_page = apply_filters('sensei_comments_per_page', $per_page, 'sensei_comments'); |
|
| 101 | 101 | |
| 102 | 102 | $paged = $this->get_pagenum(); |
| 103 | 103 | $offset = 0; |
| 104 | - if ( !empty($paged) ) { |
|
| 105 | - $offset = $per_page * ( $paged - 1 ); |
|
| 104 | + if ( ! empty($paged)) { |
|
| 105 | + $offset = $per_page * ($paged - 1); |
|
| 106 | 106 | } // End If Statement |
| 107 | 107 | |
| 108 | 108 | $args = array( |
@@ -111,19 +111,19 @@ discard block |
||
| 111 | 111 | 'orderby' => $orderby, |
| 112 | 112 | 'order' => $order, |
| 113 | 113 | ); |
| 114 | - if ( $this->search ) { |
|
| 114 | + if ($this->search) { |
|
| 115 | 115 | $args['search'] = $this->search; |
| 116 | 116 | } // End If Statement |
| 117 | 117 | |
| 118 | - $this->items = $this->get_course_statuses( $args ); |
|
| 118 | + $this->items = $this->get_course_statuses($args); |
|
| 119 | 119 | |
| 120 | 120 | $total_items = $this->total_items; |
| 121 | - $total_pages = ceil( $total_items / $per_page ); |
|
| 122 | - $this->set_pagination_args( array( |
|
| 121 | + $total_pages = ceil($total_items / $per_page); |
|
| 122 | + $this->set_pagination_args(array( |
|
| 123 | 123 | 'total_items' => $total_items, |
| 124 | 124 | 'total_pages' => $total_pages, |
| 125 | 125 | 'per_page' => $per_page |
| 126 | - ) ); |
|
| 126 | + )); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /** |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | * @since 1.7.0 |
| 132 | 132 | * @return data |
| 133 | 133 | */ |
| 134 | - public function generate_report( $report ) { |
|
| 134 | + public function generate_report($report) { |
|
| 135 | 135 | |
| 136 | 136 | $data = array(); |
| 137 | 137 | |
@@ -139,22 +139,22 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | // Handle orderby |
| 141 | 141 | $orderby = ''; |
| 142 | - if ( !empty( $_GET['orderby'] ) ) { |
|
| 143 | - if ( array_key_exists( esc_html( $_GET['orderby'] ), $this->get_sortable_columns() ) ) { |
|
| 144 | - $orderby = esc_html( $_GET['orderby'] ); |
|
| 142 | + if ( ! empty($_GET['orderby'])) { |
|
| 143 | + if (array_key_exists(esc_html($_GET['orderby']), $this->get_sortable_columns())) { |
|
| 144 | + $orderby = esc_html($_GET['orderby']); |
|
| 145 | 145 | } // End If Statement |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | // Handle order |
| 149 | 149 | $order = 'ASC'; |
| 150 | - if ( !empty( $_GET['order'] ) ) { |
|
| 151 | - $order = ( 'ASC' == strtoupper($_GET['order']) ) ? 'ASC' : 'DESC'; |
|
| 150 | + if ( ! empty($_GET['order'])) { |
|
| 151 | + $order = ('ASC' == strtoupper($_GET['order'])) ? 'ASC' : 'DESC'; |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | // Handle search |
| 155 | 155 | $search = false; |
| 156 | - if ( !empty( $_GET['s'] ) ) { |
|
| 157 | - $search = esc_html( $_GET['s'] ); |
|
| 156 | + if ( ! empty($_GET['s'])) { |
|
| 157 | + $search = esc_html($_GET['s']); |
|
| 158 | 158 | } // End If Statement |
| 159 | 159 | $this->search = $search; |
| 160 | 160 | |
@@ -162,23 +162,23 @@ discard block |
||
| 162 | 162 | 'orderby' => $orderby, |
| 163 | 163 | 'order' => $order, |
| 164 | 164 | ); |
| 165 | - if ( $this->search ) { |
|
| 165 | + if ($this->search) { |
|
| 166 | 166 | $args['search'] = $this->search; |
| 167 | 167 | } // End If Statement |
| 168 | 168 | |
| 169 | 169 | // Start the csv with the column headings |
| 170 | 170 | $column_headers = array(); |
| 171 | 171 | $columns = $this->get_columns(); |
| 172 | - foreach( $columns AS $key => $title ) { |
|
| 172 | + foreach ($columns AS $key => $title) { |
|
| 173 | 173 | $column_headers[] = $title; |
| 174 | 174 | } |
| 175 | 175 | $data[] = $column_headers; |
| 176 | 176 | |
| 177 | - $this->items = $this->get_course_statuses( $args ); |
|
| 177 | + $this->items = $this->get_course_statuses($args); |
|
| 178 | 178 | |
| 179 | 179 | // Process each row |
| 180 | - foreach( $this->items AS $item) { |
|
| 181 | - $data[] = $this->get_row_data( $item ); |
|
| 180 | + foreach ($this->items AS $item) { |
|
| 181 | + $data[] = $this->get_row_data($item); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | return $data; |
@@ -189,43 +189,43 @@ discard block |
||
| 189 | 189 | * @since 1.7.0 |
| 190 | 190 | * @param object $item The current item |
| 191 | 191 | */ |
| 192 | - protected function get_row_data( $item ) { |
|
| 192 | + protected function get_row_data($item) { |
|
| 193 | 193 | |
| 194 | - $course_title = get_the_title( $item->comment_post_ID ); |
|
| 195 | - $course_percent = get_comment_meta( $item->comment_ID, 'percent', true ); |
|
| 196 | - $course_start_date = get_comment_meta( $item->comment_ID, 'start', true ); |
|
| 194 | + $course_title = get_the_title($item->comment_post_ID); |
|
| 195 | + $course_percent = get_comment_meta($item->comment_ID, 'percent', true); |
|
| 196 | + $course_start_date = get_comment_meta($item->comment_ID, 'start', true); |
|
| 197 | 197 | $course_end_date = ''; |
| 198 | 198 | |
| 199 | - if( 'complete' == $item->comment_approved ) { |
|
| 199 | + if ('complete' == $item->comment_approved) { |
|
| 200 | 200 | |
| 201 | - $status = __( 'Completed', 'woothemes-sensei' ); |
|
| 201 | + $status = __('Completed', 'woothemes-sensei'); |
|
| 202 | 202 | $status_class = 'graded'; |
| 203 | 203 | |
| 204 | 204 | $course_end_date = $item->comment_date; |
| 205 | 205 | |
| 206 | 206 | } else { |
| 207 | 207 | |
| 208 | - $status = __( 'In Progress', 'woothemes-sensei' ); |
|
| 208 | + $status = __('In Progress', 'woothemes-sensei'); |
|
| 209 | 209 | $status_class = 'in-progress'; |
| 210 | 210 | |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | // Output users data |
| 214 | - if ( !$this->csv_output ) { |
|
| 215 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $this->user_id, 'course_id' => $item->comment_post_ID ), admin_url( 'admin.php' ) ); |
|
| 214 | + if ( ! $this->csv_output) { |
|
| 215 | + $url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $this->user_id, 'course_id' => $item->comment_post_ID), admin_url('admin.php')); |
|
| 216 | 216 | |
| 217 | - $course_title = '<strong><a class="row-title" href="' . esc_url( $url ) . '">' . $course_title . '</a></strong>'; |
|
| 218 | - $status = sprintf( '<span class="%s">%s</span>', $status_class, $status ); |
|
| 219 | - if ( is_numeric($course_percent) ) { |
|
| 217 | + $course_title = '<strong><a class="row-title" href="'.esc_url($url).'">'.$course_title.'</a></strong>'; |
|
| 218 | + $status = sprintf('<span class="%s">%s</span>', $status_class, $status); |
|
| 219 | + if (is_numeric($course_percent)) { |
|
| 220 | 220 | $course_percent .= '%'; |
| 221 | 221 | } |
| 222 | 222 | } // End If Statement |
| 223 | - $column_data = apply_filters( 'sensei_analysis_user_profile_column_data', array( 'title' => $course_title, |
|
| 223 | + $column_data = apply_filters('sensei_analysis_user_profile_column_data', array('title' => $course_title, |
|
| 224 | 224 | 'started' => $course_start_date, |
| 225 | 225 | 'completed' => $course_end_date, |
| 226 | 226 | 'status' => $status, |
| 227 | 227 | 'percent' => $course_percent, |
| 228 | - ), $item ); |
|
| 228 | + ), $item); |
|
| 229 | 229 | |
| 230 | 230 | return $column_data; |
| 231 | 231 | } |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | * @since 1.7.0 |
| 236 | 236 | * @return array statuses |
| 237 | 237 | */ |
| 238 | - private function get_course_statuses( $args ) { |
|
| 238 | + private function get_course_statuses($args) { |
|
| 239 | 239 | |
| 240 | 240 | $activity_args = array( |
| 241 | 241 | 'user_id' => $this->user_id, |
@@ -247,23 +247,23 @@ discard block |
||
| 247 | 247 | 'status' => 'any', |
| 248 | 248 | ); |
| 249 | 249 | |
| 250 | - $activity_args = apply_filters( 'sensei_analysis_user_profile_filter_statuses', $activity_args ); |
|
| 250 | + $activity_args = apply_filters('sensei_analysis_user_profile_filter_statuses', $activity_args); |
|
| 251 | 251 | |
| 252 | 252 | // WP_Comment_Query doesn't support SQL_CALC_FOUND_ROWS, so instead do this twice |
| 253 | - $this->total_items = Sensei_Utils::sensei_check_for_activity( array_merge( $activity_args, array('count' => true, 'offset' => 0, 'number' => 0) ) ); |
|
| 253 | + $this->total_items = Sensei_Utils::sensei_check_for_activity(array_merge($activity_args, array('count' => true, 'offset' => 0, 'number' => 0))); |
|
| 254 | 254 | |
| 255 | 255 | // Ensure we change our range to fit (in case a search threw off the pagination) - Should this be added to all views? |
| 256 | - if ( $this->total_items < $activity_args['offset'] ) { |
|
| 256 | + if ($this->total_items < $activity_args['offset']) { |
|
| 257 | 257 | |
| 258 | - $new_paged = floor( $this->total_items / $activity_args['number'] ); |
|
| 258 | + $new_paged = floor($this->total_items / $activity_args['number']); |
|
| 259 | 259 | $activity_args['offset'] = $new_paged * $activity_args['number']; |
| 260 | 260 | |
| 261 | 261 | } |
| 262 | - $statuses = Sensei_Utils::sensei_check_for_activity( $activity_args, true ); |
|
| 262 | + $statuses = Sensei_Utils::sensei_check_for_activity($activity_args, true); |
|
| 263 | 263 | |
| 264 | 264 | // Need to always return an array, even with only 1 item |
| 265 | - if ( !is_array($statuses) ) { |
|
| 266 | - $statuses = array( $statuses ); |
|
| 265 | + if ( ! is_array($statuses)) { |
|
| 266 | + $statuses = array($statuses); |
|
| 267 | 267 | } |
| 268 | 268 | |
| 269 | 269 | return $statuses; |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | * @return void |
| 277 | 277 | */ |
| 278 | 278 | public function no_items() { |
| 279 | - echo __( 'No courses found.', 'woothemes-sensei' ); |
|
| 279 | + echo __('No courses found.', 'woothemes-sensei'); |
|
| 280 | 280 | } // End no_items() |
| 281 | 281 | |
| 282 | 282 | /** |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | * @return void |
| 286 | 286 | */ |
| 287 | 287 | public function data_table_header() { |
| 288 | - echo '<strong>' . __( 'Courses', 'woothemes-sensei' ) . '</strong>'; |
|
| 288 | + echo '<strong>'.__('Courses', 'woothemes-sensei').'</strong>'; |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | /** |
@@ -294,10 +294,10 @@ discard block |
||
| 294 | 294 | * @return void |
| 295 | 295 | */ |
| 296 | 296 | public function data_table_footer() { |
| 297 | - $user = get_user_by( 'id', $this->user_id ); |
|
| 298 | - $report = sanitize_title( $user->display_name ) . '-course-overview'; |
|
| 299 | - $url = add_query_arg( array( 'page' => $this->page_slug, 'user_id' => $this->user_id, 'sensei_report_download' => $report ), admin_url( 'admin.php' ) ); |
|
| 300 | - echo '<a class="button button-primary" href="' . esc_url( wp_nonce_url( $url, 'sensei_csv_download-' . $report, '_sdl_nonce' ) ) . '">' . __( 'Export all rows (CSV)', 'woothemes-sensei' ) . '</a>'; |
|
| 297 | + $user = get_user_by('id', $this->user_id); |
|
| 298 | + $report = sanitize_title($user->display_name).'-course-overview'; |
|
| 299 | + $url = add_query_arg(array('page' => $this->page_slug, 'user_id' => $this->user_id, 'sensei_report_download' => $report), admin_url('admin.php')); |
|
| 300 | + echo '<a class="button button-primary" href="'.esc_url(wp_nonce_url($url, 'sensei_csv_download-'.$report, '_sdl_nonce')).'">'.__('Export all rows (CSV)', 'woothemes-sensei').'</a>'; |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | /** |
@@ -305,8 +305,8 @@ discard block |
||
| 305 | 305 | * @since 1.7.0 |
| 306 | 306 | * @return string |
| 307 | 307 | */ |
| 308 | - public function search_button( $text = '' ) { |
|
| 309 | - return __( 'Search Courses', 'woothemes-sensei' ); |
|
| 308 | + public function search_button($text = '') { |
|
| 309 | + return __('Search Courses', 'woothemes-sensei'); |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | } // End Class |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * A settings API (wrapping the WordPress Settings API). |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @access public |
| 32 | 32 | * @since 1.0.0 |
| 33 | 33 | */ |
| 34 | - public function __construct () { |
|
| 34 | + public function __construct() { |
|
| 35 | 35 | |
| 36 | 36 | $this->token = 'woothemes-sensei-settings'; |
| 37 | 37 | $this->page_slug = 'woothemes-sensei-settings-api'; |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function register_hook_listener() { |
| 59 | 59 | |
| 60 | - add_action( 'admin_menu', array( $this, 'register_settings_screen' ), 60 ); |
|
| 61 | - add_action( 'admin_init', array( $this, 'settings_fields' ) ); |
|
| 62 | - add_action( 'init', array( $this, 'general_init' ) ); |
|
| 60 | + add_action('admin_menu', array($this, 'register_settings_screen'), 60); |
|
| 61 | + add_action('admin_init', array($this, 'settings_fields')); |
|
| 62 | + add_action('init', array($this, 'general_init')); |
|
| 63 | 63 | |
| 64 | 64 | } // End setup_settings() |
| 65 | 65 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | $this->init_sections(); |
| 74 | 74 | $this->init_fields(); |
| 75 | 75 | $this->get_settings(); |
| 76 | - if ( $this->has_tabs == true ) { |
|
| 76 | + if ($this->has_tabs == true) { |
|
| 77 | 77 | $this->create_tabs(); |
| 78 | 78 | } // End If Statement |
| 79 | 79 | } // End general_init() |
@@ -84,9 +84,9 @@ discard block |
||
| 84 | 84 | * @since 1.0.0 |
| 85 | 85 | * @return void |
| 86 | 86 | */ |
| 87 | - public function init_sections () { |
|
| 87 | + public function init_sections() { |
|
| 88 | 88 | // Override this function in your class and assign the array of sections to $this->sections. |
| 89 | - _e( 'Override init_sections() in your class.', 'woothemes-sensei' ); |
|
| 89 | + _e('Override init_sections() in your class.', 'woothemes-sensei'); |
|
| 90 | 90 | } // End init_sections() |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -95,9 +95,9 @@ discard block |
||
| 95 | 95 | * @since 1.0.0 |
| 96 | 96 | * @return void |
| 97 | 97 | */ |
| 98 | - public function init_fields () { |
|
| 98 | + public function init_fields() { |
|
| 99 | 99 | // Override this function in your class and assign the array of sections to $this->fields. |
| 100 | - _e( 'Override init_fields() in your class.', 'woothemes-sensei' ); |
|
| 100 | + _e('Override init_fields() in your class.', 'woothemes-sensei'); |
|
| 101 | 101 | } // End init_fields() |
| 102 | 102 | |
| 103 | 103 | /** |
@@ -106,34 +106,34 @@ discard block |
||
| 106 | 106 | * @since 1.1.0 |
| 107 | 107 | * @return void |
| 108 | 108 | */ |
| 109 | - public function settings_tabs () { |
|
| 109 | + public function settings_tabs() { |
|
| 110 | 110 | |
| 111 | - if ( ! $this->has_tabs ) { return; } |
|
| 111 | + if ( ! $this->has_tabs) { return; } |
|
| 112 | 112 | |
| 113 | - if ( count( $this->tabs ) > 0 ) { |
|
| 113 | + if (count($this->tabs) > 0) { |
|
| 114 | 114 | $html = ''; |
| 115 | 115 | |
| 116 | - $html .= '<ul id="settings-sections" class="subsubsub hide-if-no-js">' . "\n"; |
|
| 116 | + $html .= '<ul id="settings-sections" class="subsubsub hide-if-no-js">'."\n"; |
|
| 117 | 117 | |
| 118 | 118 | $sections = array( |
| 119 | - 'all' => array( 'href' => '#all', 'name' => __( 'All', 'woothemes-sensei' ), 'class' => 'current all tab' ) |
|
| 119 | + 'all' => array('href' => '#all', 'name' => __('All', 'woothemes-sensei'), 'class' => 'current all tab') |
|
| 120 | 120 | ); |
| 121 | 121 | |
| 122 | - foreach ( $this->tabs as $k => $v ) { |
|
| 123 | - $sections[$k] = array( 'href' => '#' . esc_attr( $k ), 'name' => esc_attr( $v['name'] ), 'class' => 'tab' ); |
|
| 122 | + foreach ($this->tabs as $k => $v) { |
|
| 123 | + $sections[$k] = array('href' => '#'.esc_attr($k), 'name' => esc_attr($v['name']), 'class' => 'tab'); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $count = 1; |
| 127 | - foreach ( $sections as $k => $v ) { |
|
| 127 | + foreach ($sections as $k => $v) { |
|
| 128 | 128 | $count++; |
| 129 | - $html .= '<li><a href="' . $v['href'] . '"'; |
|
| 130 | - if ( isset( $v['class'] ) && ( $v['class'] != '' ) ) { $html .= ' class="' . esc_attr( $v['class'] ) . '"'; } |
|
| 131 | - $html .= '>' . esc_attr( $v['name'] ) . '</a>'; |
|
| 132 | - if ( $count <= count( $sections ) ) { $html .= ' | '; } |
|
| 133 | - $html .= '</li>' . "\n"; |
|
| 129 | + $html .= '<li><a href="'.$v['href'].'"'; |
|
| 130 | + if (isset($v['class']) && ($v['class'] != '')) { $html .= ' class="'.esc_attr($v['class']).'"'; } |
|
| 131 | + $html .= '>'.esc_attr($v['name']).'</a>'; |
|
| 132 | + if ($count <= count($sections)) { $html .= ' | '; } |
|
| 133 | + $html .= '</li>'."\n"; |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - $html .= '</ul><div class="clear"></div>' . "\n"; |
|
| 136 | + $html .= '</ul><div class="clear"></div>'."\n"; |
|
| 137 | 137 | |
| 138 | 138 | echo $html; |
| 139 | 139 | } |
@@ -145,10 +145,10 @@ discard block |
||
| 145 | 145 | * @since 1.1.0 |
| 146 | 146 | * @return void |
| 147 | 147 | */ |
| 148 | - private function create_tabs () { |
|
| 149 | - if ( count( $this->sections ) > 0 ) { |
|
| 148 | + private function create_tabs() { |
|
| 149 | + if (count($this->sections) > 0) { |
|
| 150 | 150 | $tabs = array(); |
| 151 | - foreach ( $this->sections as $k => $v ) { |
|
| 151 | + foreach ($this->sections as $k => $v) { |
|
| 152 | 152 | $tabs[$k] = $v; |
| 153 | 153 | } |
| 154 | 154 | |
@@ -162,10 +162,10 @@ discard block |
||
| 162 | 162 | * @since 1.0.0 |
| 163 | 163 | * @return void |
| 164 | 164 | */ |
| 165 | - public function create_sections () { |
|
| 166 | - if ( count( $this->sections ) > 0 ) { |
|
| 167 | - foreach ( $this->sections as $k => $v ) { |
|
| 168 | - add_settings_section( $k, $v['name'], array( $this, 'section_description' ), $this->token ); |
|
| 165 | + public function create_sections() { |
|
| 166 | + if (count($this->sections) > 0) { |
|
| 167 | + foreach ($this->sections as $k => $v) { |
|
| 168 | + add_settings_section($k, $v['name'], array($this, 'section_description'), $this->token); |
|
| 169 | 169 | } |
| 170 | 170 | } |
| 171 | 171 | } // End create_sections() |
@@ -176,18 +176,18 @@ discard block |
||
| 176 | 176 | * @since 1.0.0 |
| 177 | 177 | * @return void |
| 178 | 178 | */ |
| 179 | - public function create_fields () { |
|
| 180 | - if ( count( $this->sections ) > 0 ) { |
|
| 179 | + public function create_fields() { |
|
| 180 | + if (count($this->sections) > 0) { |
|
| 181 | 181 | // $this->parse_fields( $this->fields ); |
| 182 | 182 | |
| 183 | - foreach ( $this->fields as $k => $v ) { |
|
| 184 | - $method = $this->determine_method( $v, 'form' ); |
|
| 183 | + foreach ($this->fields as $k => $v) { |
|
| 184 | + $method = $this->determine_method($v, 'form'); |
|
| 185 | 185 | $name = $v['name']; |
| 186 | - if ( $v['type'] == 'info' ) { $name = ''; } |
|
| 187 | - add_settings_field( $k, $name, $method, $this->token, $v['section'], array( 'key' => $k, 'data' => $v ) ); |
|
| 186 | + if ($v['type'] == 'info') { $name = ''; } |
|
| 187 | + add_settings_field($k, $name, $method, $this->token, $v['section'], array('key' => $k, 'data' => $v)); |
|
| 188 | 188 | |
| 189 | 189 | // Let the API know that we have a colourpicker field. |
| 190 | - if ( $v['type'] == 'range' && $this->has_range == false ) { $this->has_range = true; } |
|
| 190 | + if ($v['type'] == 'range' && $this->has_range == false) { $this->has_range = true; } |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | } // End create_fields() |
@@ -199,43 +199,43 @@ discard block |
||
| 199 | 199 | * @param array $data |
| 200 | 200 | * @return callable, array or string |
| 201 | 201 | */ |
| 202 | - protected function determine_method ( $data, $type = 'form' ) { |
|
| 202 | + protected function determine_method($data, $type = 'form') { |
|
| 203 | 203 | $method = ''; |
| 204 | 204 | |
| 205 | - if ( ! in_array( $type, array( 'form', 'validate', 'check' ) ) ) { return; } |
|
| 205 | + if ( ! in_array($type, array('form', 'validate', 'check'))) { return; } |
|
| 206 | 206 | |
| 207 | 207 | // Check for custom functions. |
| 208 | - if ( isset( $data[$type] ) ) { |
|
| 209 | - if ( function_exists( $data[$type] ) ) { |
|
| 208 | + if (isset($data[$type])) { |
|
| 209 | + if (function_exists($data[$type])) { |
|
| 210 | 210 | $method = $data[$type]; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - if ( $method == '' && method_exists( $this, $data[$type] ) ) { |
|
| 214 | - if ( $type == 'form' ) { |
|
| 215 | - $method = array( $this, $data[$type] ); |
|
| 213 | + if ($method == '' && method_exists($this, $data[$type])) { |
|
| 214 | + if ($type == 'form') { |
|
| 215 | + $method = array($this, $data[$type]); |
|
| 216 | 216 | } else { |
| 217 | 217 | $method = $data[$type]; |
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | - if ( $method == '' && method_exists ( $this, $type . '_field_' . $data['type'] ) ) { |
|
| 223 | - if ( $type == 'form' ) { |
|
| 224 | - $method = array( $this, $type . '_field_' . $data['type'] ); |
|
| 222 | + if ($method == '' && method_exists($this, $type.'_field_'.$data['type'])) { |
|
| 223 | + if ($type == 'form') { |
|
| 224 | + $method = array($this, $type.'_field_'.$data['type']); |
|
| 225 | 225 | } else { |
| 226 | - $method = $type . '_field_' . $data['type']; |
|
| 226 | + $method = $type.'_field_'.$data['type']; |
|
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | - if ( $method == '' && function_exists ( $this->token . '_' . $type . '_field_' . $data['type'] ) ) { |
|
| 231 | - $method = $this->token . '_' . $type . '_field_' . $data['type']; |
|
| 230 | + if ($method == '' && function_exists($this->token.'_'.$type.'_field_'.$data['type'])) { |
|
| 231 | + $method = $this->token.'_'.$type.'_field_'.$data['type']; |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - if ( $method == '' ) { |
|
| 235 | - if ( $type == 'form' ) { |
|
| 236 | - $method = array( $this, $type . '_field_text' ); |
|
| 234 | + if ($method == '') { |
|
| 235 | + if ($type == 'form') { |
|
| 236 | + $method = array($this, $type.'_field_text'); |
|
| 237 | 237 | } else { |
| 238 | - $method = $type . '_field_text'; |
|
| 238 | + $method = $type.'_field_text'; |
|
| 239 | 239 | } |
| 240 | 240 | } |
| 241 | 241 | |
@@ -249,10 +249,10 @@ discard block |
||
| 249 | 249 | * @param array $fields |
| 250 | 250 | * @return void |
| 251 | 251 | */ |
| 252 | - public function parse_fields ( $fields ) { |
|
| 253 | - foreach ( $fields as $k => $v ) { |
|
| 254 | - if ( isset( $v['section'] ) && ( $v['section'] != '' ) && ( isset( $this->sections[$v['section']] ) ) ) { |
|
| 255 | - if ( ! isset( $this->sections[$v['section']]['fields'] ) ) { |
|
| 252 | + public function parse_fields($fields) { |
|
| 253 | + foreach ($fields as $k => $v) { |
|
| 254 | + if (isset($v['section']) && ($v['section'] != '') && (isset($this->sections[$v['section']]))) { |
|
| 255 | + if ( ! isset($this->sections[$v['section']]['fields'])) { |
|
| 256 | 256 | $this->sections[$v['section']]['fields'] = array(); |
| 257 | 257 | } |
| 258 | 258 | |
@@ -269,19 +269,19 @@ discard block |
||
| 269 | 269 | * @since 1.0.0 |
| 270 | 270 | * @return void |
| 271 | 271 | */ |
| 272 | - public function register_settings_screen () { |
|
| 272 | + public function register_settings_screen() { |
|
| 273 | 273 | |
| 274 | - if ( current_user_can( 'manage_sensei' ) ) { |
|
| 275 | - $hook = add_submenu_page( 'sensei', $this->name, $this->menu_label, 'manage_sensei', $this->page_slug, array( $this, 'settings_screen' ) ); |
|
| 274 | + if (current_user_can('manage_sensei')) { |
|
| 275 | + $hook = add_submenu_page('sensei', $this->name, $this->menu_label, 'manage_sensei', $this->page_slug, array($this, 'settings_screen')); |
|
| 276 | 276 | |
| 277 | 277 | $this->hook = $hook; |
| 278 | 278 | } |
| 279 | 279 | |
| 280 | - if ( isset( $_GET['page'] ) && ( $_GET['page'] == $this->page_slug ) ) { |
|
| 280 | + if (isset($_GET['page']) && ($_GET['page'] == $this->page_slug)) { |
|
| 281 | 281 | |
| 282 | - add_action( 'admin_notices', array( $this, 'settings_errors' ) ); |
|
| 283 | - add_action( 'admin_print_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 284 | - add_action( 'admin_print_styles', array( $this, 'enqueue_styles' ) ); |
|
| 282 | + add_action('admin_notices', array($this, 'settings_errors')); |
|
| 283 | + add_action('admin_print_scripts', array($this, 'enqueue_scripts')); |
|
| 284 | + add_action('admin_print_styles', array($this, 'enqueue_styles')); |
|
| 285 | 285 | |
| 286 | 286 | } |
| 287 | 287 | } // End register_settings_screen() |
@@ -292,21 +292,21 @@ discard block |
||
| 292 | 292 | * @since 1.0.0 |
| 293 | 293 | * @return void |
| 294 | 294 | */ |
| 295 | - public function settings_screen () { |
|
| 295 | + public function settings_screen() { |
|
| 296 | 296 | |
| 297 | 297 | ?> |
| 298 | -<div id="woothemes-sensei" class="wrap <?php echo esc_attr( $this->token ); ?>"> |
|
| 299 | - <?php screen_icon( 'woothemes-sensei' ); ?> |
|
| 300 | - <h2><?php echo esc_html( $this->name ); ?><?php if ( '' != $this->settings_version ) { echo ' <span class="version">' . $this->settings_version . '</span>'; } ?></h2> |
|
| 301 | - <p class="powered-by-woo"><?php _e( 'Powered by', 'woothemes-sensei' ); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p> |
|
| 302 | - <?php do_action( 'settings_before_form' ); ?> |
|
| 298 | +<div id="woothemes-sensei" class="wrap <?php echo esc_attr($this->token); ?>"> |
|
| 299 | + <?php screen_icon('woothemes-sensei'); ?> |
|
| 300 | + <h2><?php echo esc_html($this->name); ?><?php if ('' != $this->settings_version) { echo ' <span class="version">'.$this->settings_version.'</span>'; } ?></h2> |
|
| 301 | + <p class="powered-by-woo"><?php _e('Powered by', 'woothemes-sensei'); ?><a href="http://www.woothemes.com/" title="WooThemes"><img src="<?php echo Sensei()->plugin_url; ?>assets/images/woothemes.png" alt="WooThemes" /></a></p> |
|
| 302 | + <?php do_action('settings_before_form'); ?> |
|
| 303 | 303 | <form action="options.php" method="post"> |
| 304 | 304 | <?php $this->settings_tabs(); ?> |
| 305 | - <?php settings_fields( $this->token ); ?> |
|
| 306 | - <?php do_settings_sections( $this->token ); ?> |
|
| 305 | + <?php settings_fields($this->token); ?> |
|
| 306 | + <?php do_settings_sections($this->token); ?> |
|
| 307 | 307 | <?php submit_button(); ?> |
| 308 | 308 | </form> |
| 309 | - <?php do_action( 'settings_after_form' ); ?> |
|
| 309 | + <?php do_action('settings_after_form'); ?> |
|
| 310 | 310 | </div><!--/#woothemes-sensei--> |
| 311 | 311 | <?php |
| 312 | 312 | } // End settings_screen() |
@@ -317,16 +317,16 @@ discard block |
||
| 317 | 317 | * @since 1.0.0 |
| 318 | 318 | * @return array |
| 319 | 319 | */ |
| 320 | - public function get_settings () { |
|
| 321 | - if ( ! is_array( $this->settings ) ) { |
|
| 322 | - $this->settings = get_option( $this->token, array() ); |
|
| 320 | + public function get_settings() { |
|
| 321 | + if ( ! is_array($this->settings)) { |
|
| 322 | + $this->settings = get_option($this->token, array()); |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | - foreach ( $this->fields as $k => $v ) { |
|
| 326 | - if ( ! isset( $this->settings[$k] ) && isset( $v['default'] ) ) { |
|
| 325 | + foreach ($this->fields as $k => $v) { |
|
| 326 | + if ( ! isset($this->settings[$k]) && isset($v['default'])) { |
|
| 327 | 327 | $this->settings[$k] = $v['default']; |
| 328 | 328 | } |
| 329 | - if ( $v['type'] == 'checkbox' && $this->settings[$k] != true ) { |
|
| 329 | + if ($v['type'] == 'checkbox' && $this->settings[$k] != true) { |
|
| 330 | 330 | $this->settings[$k] = 0; |
| 331 | 331 | } |
| 332 | 332 | } |
@@ -340,8 +340,8 @@ discard block |
||
| 340 | 340 | * @since 1.0.0 |
| 341 | 341 | * @return void |
| 342 | 342 | */ |
| 343 | - public function settings_fields () { |
|
| 344 | - register_setting( $this->token, $this->token, array( $this, 'validate_fields' ) ); |
|
| 343 | + public function settings_fields() { |
|
| 344 | + register_setting($this->token, $this->token, array($this, 'validate_fields')); |
|
| 345 | 345 | $this->create_sections(); |
| 346 | 346 | $this->create_fields(); |
| 347 | 347 | } // End settings_fields() |
@@ -352,8 +352,8 @@ discard block |
||
| 352 | 352 | * @since 1.0.0 |
| 353 | 353 | * @return void |
| 354 | 354 | */ |
| 355 | - public function settings_errors () { |
|
| 356 | - settings_errors( $this->token . '-errors' ); |
|
| 355 | + public function settings_errors() { |
|
| 356 | + settings_errors($this->token.'-errors'); |
|
| 357 | 357 | } // End settings_errors() |
| 358 | 358 | |
| 359 | 359 | /** |
@@ -362,9 +362,9 @@ discard block |
||
| 362 | 362 | * @since 1.0.0 |
| 363 | 363 | * @return void |
| 364 | 364 | */ |
| 365 | - public function section_description ( $section ) { |
|
| 366 | - if ( isset( $this->sections[$section['id']]['description'] ) ) { |
|
| 367 | - echo wpautop( $this->sections[$section['id']]['description'] ); |
|
| 365 | + public function section_description($section) { |
|
| 366 | + if (isset($this->sections[$section['id']]['description'])) { |
|
| 367 | + echo wpautop($this->sections[$section['id']]['description']); |
|
| 368 | 368 | } |
| 369 | 369 | } // End section_description_main() |
| 370 | 370 | |
@@ -375,12 +375,12 @@ discard block |
||
| 375 | 375 | * @param array $args |
| 376 | 376 | * @return void |
| 377 | 377 | */ |
| 378 | - public function form_field_text ( $args ) { |
|
| 378 | + public function form_field_text($args) { |
|
| 379 | 379 | $options = $this->get_settings(); |
| 380 | 380 | |
| 381 | - echo '<input id="' . esc_attr( $args['key'] ) . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" size="40" type="text" value="' . esc_attr( $options[$args['key']] ) . '" />' . "\n"; |
|
| 382 | - if ( isset( $args['data']['description'] ) ) { |
|
| 383 | - echo '<span class="description">' . $args['data']['description'] . '</span>' . "\n"; |
|
| 381 | + echo '<input id="'.esc_attr($args['key']).'" name="'.$this->token.'['.esc_attr($args['key']).']" size="40" type="text" value="'.esc_attr($options[$args['key']]).'" />'."\n"; |
|
| 382 | + if (isset($args['data']['description'])) { |
|
| 383 | + echo '<span class="description">'.$args['data']['description'].'</span>'."\n"; |
|
| 384 | 384 | } |
| 385 | 385 | } // End form_field_text() |
| 386 | 386 | |
@@ -391,13 +391,13 @@ discard block |
||
| 391 | 391 | * @param array $args |
| 392 | 392 | * @return void |
| 393 | 393 | */ |
| 394 | - public function form_field_color ( $args ) { |
|
| 394 | + public function form_field_color($args) { |
|
| 395 | 395 | $options = $this->get_settings(); |
| 396 | 396 | |
| 397 | - echo '<input id="' . esc_attr( $args['key'] ) . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" size="40" type="text" class="color" value="' . esc_attr( $options[$args['key']] ) . '" />' . "\n"; |
|
| 397 | + echo '<input id="'.esc_attr($args['key']).'" name="'.$this->token.'['.esc_attr($args['key']).']" size="40" type="text" class="color" value="'.esc_attr($options[$args['key']]).'" />'."\n"; |
|
| 398 | 398 | echo '<div style="position:absolute;background:#FFF;z-index:99;border-radius:100%;" class="colorpicker"></div>'; |
| 399 | - if ( isset( $args['data']['description'] ) ) { |
|
| 400 | - echo '<span class="description">' . $args['data']['description'] . '</span>' . "\n"; |
|
| 399 | + if (isset($args['data']['description'])) { |
|
| 400 | + echo '<span class="description">'.$args['data']['description'].'</span>'."\n"; |
|
| 401 | 401 | } |
| 402 | 402 | } // End form_field_text() |
| 403 | 403 | |
@@ -408,22 +408,22 @@ discard block |
||
| 408 | 408 | * @param array $args |
| 409 | 409 | * @return void |
| 410 | 410 | */ |
| 411 | - public function form_field_checkbox ( $args ) { |
|
| 411 | + public function form_field_checkbox($args) { |
|
| 412 | 412 | $options = $this->get_settings(); |
| 413 | 413 | |
| 414 | 414 | $has_description = false; |
| 415 | - if ( isset( $args['data']['description'] ) ) { |
|
| 415 | + if (isset($args['data']['description'])) { |
|
| 416 | 416 | $has_description = true; |
| 417 | - echo '<label for="' . esc_attr( $args['key'] ) . '">' . "\n"; |
|
| 417 | + echo '<label for="'.esc_attr($args['key']).'">'."\n"; |
|
| 418 | 418 | } |
| 419 | - echo '<input id="' . $args['key'] . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" type="checkbox" value="1"' . checked( esc_attr( $options[$args['key']] ), '1', false ) . ' />' . "\n"; |
|
| 420 | - if ( $has_description ) { |
|
| 421 | - echo wp_kses( $args['data']['description'], array( 'a' => array( |
|
| 419 | + echo '<input id="'.$args['key'].'" name="'.$this->token.'['.esc_attr($args['key']).']" type="checkbox" value="1"'.checked(esc_attr($options[$args['key']]), '1', false).' />'."\n"; |
|
| 420 | + if ($has_description) { |
|
| 421 | + echo wp_kses($args['data']['description'], array('a' => array( |
|
| 422 | 422 | 'href' => array(), |
| 423 | 423 | 'title' => array() |
| 424 | 424 | ) |
| 425 | 425 | ) |
| 426 | - ) . '</label>' . "\n"; |
|
| 426 | + ).'</label>'."\n"; |
|
| 427 | 427 | } |
| 428 | 428 | } // End form_field_checkbox() |
| 429 | 429 | |
@@ -434,12 +434,12 @@ discard block |
||
| 434 | 434 | * @param array $args |
| 435 | 435 | * @return void |
| 436 | 436 | */ |
| 437 | - public function form_field_textarea ( $args ) { |
|
| 437 | + public function form_field_textarea($args) { |
|
| 438 | 438 | $options = $this->get_settings(); |
| 439 | 439 | |
| 440 | - echo '<textarea id="' . esc_attr( $args['key'] ) . '" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" cols="42" rows="5">' . esc_html( $options[$args['key']] ) . '</textarea>' . "\n"; |
|
| 441 | - if ( isset( $args['data']['description'] ) ) { |
|
| 442 | - echo '<p><span class="description">' . esc_html( $args['data']['description'] ) . '</span></p>' . "\n"; |
|
| 440 | + echo '<textarea id="'.esc_attr($args['key']).'" name="'.$this->token.'['.esc_attr($args['key']).']" cols="42" rows="5">'.esc_html($options[$args['key']]).'</textarea>'."\n"; |
|
| 441 | + if (isset($args['data']['description'])) { |
|
| 442 | + echo '<p><span class="description">'.esc_html($args['data']['description']).'</span></p>'."\n"; |
|
| 443 | 443 | } |
| 444 | 444 | } // End form_field_textarea() |
| 445 | 445 | |
@@ -450,20 +450,20 @@ discard block |
||
| 450 | 450 | * @param array $args |
| 451 | 451 | * @return void |
| 452 | 452 | */ |
| 453 | - public function form_field_select ( $args ) { |
|
| 453 | + public function form_field_select($args) { |
|
| 454 | 454 | $options = $this->get_settings(); |
| 455 | 455 | |
| 456 | - if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) { |
|
| 456 | + if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) { |
|
| 457 | 457 | $html = ''; |
| 458 | - $html .= '<select class="" id="' . esc_attr( $args['key'] ) . '" name="' . esc_attr( $this->token ) . '[' . esc_attr( $args['key'] ) . ']">' . "\n"; |
|
| 459 | - foreach ( $args['data']['options'] as $k => $v ) { |
|
| 460 | - $html .= '<option value="' . esc_attr( $k ) . '"' . selected( esc_attr( $options[$args['key']] ), $k, false ) . '>' . $v . '</option>' . "\n"; |
|
| 458 | + $html .= '<select class="" id="'.esc_attr($args['key']).'" name="'.esc_attr($this->token).'['.esc_attr($args['key']).']">'."\n"; |
|
| 459 | + foreach ($args['data']['options'] as $k => $v) { |
|
| 460 | + $html .= '<option value="'.esc_attr($k).'"'.selected(esc_attr($options[$args['key']]), $k, false).'>'.$v.'</option>'."\n"; |
|
| 461 | 461 | } |
| 462 | - $html .= '</select>' . "\n"; |
|
| 462 | + $html .= '</select>'."\n"; |
|
| 463 | 463 | echo $html; |
| 464 | 464 | |
| 465 | - if ( isset( $args['data']['description'] ) ) { |
|
| 466 | - echo '<p><span class="description">' . esc_html( $args['data']['description'] ) . '</span></p>' . "\n"; |
|
| 465 | + if (isset($args['data']['description'])) { |
|
| 466 | + echo '<p><span class="description">'.esc_html($args['data']['description']).'</span></p>'."\n"; |
|
| 467 | 467 | } |
| 468 | 468 | } |
| 469 | 469 | } // End form_field_select() |
@@ -475,18 +475,18 @@ discard block |
||
| 475 | 475 | * @param array $args |
| 476 | 476 | * @return void |
| 477 | 477 | */ |
| 478 | - public function form_field_radio ( $args ) { |
|
| 478 | + public function form_field_radio($args) { |
|
| 479 | 479 | $options = $this->get_settings(); |
| 480 | 480 | |
| 481 | - if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) { |
|
| 481 | + if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) { |
|
| 482 | 482 | $html = ''; |
| 483 | - foreach ( $args['data']['options'] as $k => $v ) { |
|
| 484 | - $html .= '<input type="radio" name="' . $this->token . '[' . esc_attr( $args['key'] ) . ']" value="' . esc_attr( $k ) . '"' . checked( esc_attr( $options[$args['key']] ), $k, false ) . ' /> ' . $v . '<br />' . "\n"; |
|
| 483 | + foreach ($args['data']['options'] as $k => $v) { |
|
| 484 | + $html .= '<input type="radio" name="'.$this->token.'['.esc_attr($args['key']).']" value="'.esc_attr($k).'"'.checked(esc_attr($options[$args['key']]), $k, false).' /> '.$v.'<br />'."\n"; |
|
| 485 | 485 | } |
| 486 | 486 | echo $html; |
| 487 | 487 | |
| 488 | - if ( isset( $args['data']['description'] ) ) { |
|
| 489 | - echo '<span class="description">' . esc_html( $args['data']['description'] ) . '</span>' . "\n"; |
|
| 488 | + if (isset($args['data']['description'])) { |
|
| 489 | + echo '<span class="description">'.esc_html($args['data']['description']).'</span>'."\n"; |
|
| 490 | 490 | } |
| 491 | 491 | } |
| 492 | 492 | } // End form_field_radio() |
@@ -498,28 +498,28 @@ discard block |
||
| 498 | 498 | * @param array $args |
| 499 | 499 | * @return void |
| 500 | 500 | */ |
| 501 | - public function form_field_multicheck ( $args ) { |
|
| 501 | + public function form_field_multicheck($args) { |
|
| 502 | 502 | $options = $this->get_settings(); |
| 503 | 503 | |
| 504 | - if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) { |
|
| 505 | - $html = '<div class="multicheck-container" style="margin-bottom:10px;">' . "\n"; |
|
| 506 | - foreach ( $args['data']['options'] as $k => $v ) { |
|
| 504 | + if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) { |
|
| 505 | + $html = '<div class="multicheck-container" style="margin-bottom:10px;">'."\n"; |
|
| 506 | + foreach ($args['data']['options'] as $k => $v) { |
|
| 507 | 507 | $checked = ''; |
| 508 | 508 | |
| 509 | - if( isset( $options[ $args['key'] ] ) ) { |
|
| 510 | - if ( in_array( $k, (array)$options[ $args['key'] ] ) ) { $checked = ' checked="checked"'; } |
|
| 509 | + if (isset($options[$args['key']])) { |
|
| 510 | + if (in_array($k, (array) $options[$args['key']])) { $checked = ' checked="checked"'; } |
|
| 511 | 511 | } else { |
| 512 | - if ( in_array( $k, $args['data']['defaults'] ) ) { $checked = ' checked="checked"'; } |
|
| 512 | + if (in_array($k, $args['data']['defaults'])) { $checked = ' checked="checked"'; } |
|
| 513 | 513 | } |
| 514 | - $html .= '<label for="checkbox-' . esc_attr( $k ) . '">' . "\n"; |
|
| 515 | - $html .= '<input type="checkbox" name="' . esc_attr( $this->token ) . '[' . esc_attr( $args['key'] ) . '][]" class="multicheck multicheck-' . esc_attr( $args['key'] ) . '" value="' . esc_attr( $k ) . '" id="checkbox-' . esc_attr( $k ) . '" ' . $checked . ' /> ' . $v . "\n"; |
|
| 516 | - $html .= '</label><br />' . "\n"; |
|
| 514 | + $html .= '<label for="checkbox-'.esc_attr($k).'">'."\n"; |
|
| 515 | + $html .= '<input type="checkbox" name="'.esc_attr($this->token).'['.esc_attr($args['key']).'][]" class="multicheck multicheck-'.esc_attr($args['key']).'" value="'.esc_attr($k).'" id="checkbox-'.esc_attr($k).'" '.$checked.' /> '.$v."\n"; |
|
| 516 | + $html .= '</label><br />'."\n"; |
|
| 517 | 517 | } |
| 518 | - $html .= '</div>' . "\n"; |
|
| 518 | + $html .= '</div>'."\n"; |
|
| 519 | 519 | echo $html; |
| 520 | 520 | |
| 521 | - if ( isset( $args['data']['description'] ) ) { |
|
| 522 | - echo '<span class="description">' . esc_html( $args['data']['description'] ) . '</span>' . "\n"; |
|
| 521 | + if (isset($args['data']['description'])) { |
|
| 522 | + echo '<span class="description">'.esc_html($args['data']['description']).'</span>'."\n"; |
|
| 523 | 523 | } |
| 524 | 524 | } |
| 525 | 525 | } // End form_field_multicheck() |
@@ -531,20 +531,20 @@ discard block |
||
| 531 | 531 | * @param array $args |
| 532 | 532 | * @return void |
| 533 | 533 | */ |
| 534 | - public function form_field_range ( $args ) { |
|
| 534 | + public function form_field_range($args) { |
|
| 535 | 535 | $options = $this->get_settings(); |
| 536 | 536 | |
| 537 | - if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) { |
|
| 537 | + if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) { |
|
| 538 | 538 | $html = ''; |
| 539 | - $html .= '<select id="' . esc_attr( $args['key'] ) . '" name="' . esc_attr( $this->token ) . '[' . esc_attr( $args['key'] ) . ']" class="range-input">' . "\n"; |
|
| 540 | - foreach ( $args['data']['options'] as $k => $v ) { |
|
| 541 | - $html .= '<option value="' . esc_attr( $k ) . '"' . selected( esc_attr( $options[$args['key']] ), $k, false ) . '>' . $v . '</option>' . "\n"; |
|
| 539 | + $html .= '<select id="'.esc_attr($args['key']).'" name="'.esc_attr($this->token).'['.esc_attr($args['key']).']" class="range-input">'."\n"; |
|
| 540 | + foreach ($args['data']['options'] as $k => $v) { |
|
| 541 | + $html .= '<option value="'.esc_attr($k).'"'.selected(esc_attr($options[$args['key']]), $k, false).'>'.$v.'</option>'."\n"; |
|
| 542 | 542 | } |
| 543 | - $html .= '</select>' . "\n"; |
|
| 543 | + $html .= '</select>'."\n"; |
|
| 544 | 544 | echo $html; |
| 545 | 545 | |
| 546 | - if ( isset( $args['data']['description'] ) ) { |
|
| 547 | - echo '<p><span class="description">' . esc_html( $args['data']['description'] ) . '</span></p>' . "\n"; |
|
| 546 | + if (isset($args['data']['description'])) { |
|
| 547 | + echo '<p><span class="description">'.esc_html($args['data']['description']).'</span></p>'."\n"; |
|
| 548 | 548 | } |
| 549 | 549 | } |
| 550 | 550 | } // End form_field_range() |
@@ -556,18 +556,18 @@ discard block |
||
| 556 | 556 | * @param array $args |
| 557 | 557 | * @return void |
| 558 | 558 | */ |
| 559 | - public function form_field_images ( $args ) { |
|
| 559 | + public function form_field_images($args) { |
|
| 560 | 560 | $options = $this->get_settings(); |
| 561 | 561 | |
| 562 | - if ( isset( $args['data']['options'] ) && ( count( (array)$args['data']['options'] ) > 0 ) ) { |
|
| 562 | + if (isset($args['data']['options']) && (count((array) $args['data']['options']) > 0)) { |
|
| 563 | 563 | $html = ''; |
| 564 | - foreach ( $args['data']['options'] as $k => $v ) { |
|
| 565 | - $html .= '<input type="radio" name="' . esc_attr( $this->token ) . '[' . esc_attr( $args['key'] ) . ']" value="' . esc_attr( $k ) . '"' . checked( esc_attr( $options[$args['key']] ), $k, false ) . ' /> ' . $v . '<br />' . "\n"; |
|
| 564 | + foreach ($args['data']['options'] as $k => $v) { |
|
| 565 | + $html .= '<input type="radio" name="'.esc_attr($this->token).'['.esc_attr($args['key']).']" value="'.esc_attr($k).'"'.checked(esc_attr($options[$args['key']]), $k, false).' /> '.$v.'<br />'."\n"; |
|
| 566 | 566 | } |
| 567 | 567 | echo $html; |
| 568 | 568 | |
| 569 | - if ( isset( $args['data']['description'] ) ) { |
|
| 570 | - echo '<span class="description">' . esc_html( $args['data']['description'] ) . '</span>' . "\n"; |
|
| 569 | + if (isset($args['data']['description'])) { |
|
| 570 | + echo '<span class="description">'.esc_html($args['data']['description']).'</span>'."\n"; |
|
| 571 | 571 | } |
| 572 | 572 | } |
| 573 | 573 | } // End form_field_images() |
@@ -579,19 +579,19 @@ discard block |
||
| 579 | 579 | * @param array $args |
| 580 | 580 | * @return void |
| 581 | 581 | */ |
| 582 | - public function form_field_info ( $args ) { |
|
| 582 | + public function form_field_info($args) { |
|
| 583 | 583 | $class = ''; |
| 584 | - if ( isset( $args['data']['class'] ) ) { |
|
| 585 | - $class = ' ' . esc_attr( $args['data']['class'] ); |
|
| 584 | + if (isset($args['data']['class'])) { |
|
| 585 | + $class = ' '.esc_attr($args['data']['class']); |
|
| 586 | 586 | } |
| 587 | - $html = '<div id="' . $args['key'] . '" class="info-box' . $class . '">' . "\n"; |
|
| 588 | - if ( isset( $args['data']['name'] ) && ( $args['data']['name'] != '' ) ) { |
|
| 589 | - $html .= '<h3 class="title">' . esc_html( $args['data']['name'] ) . '</h3>' . "\n"; |
|
| 587 | + $html = '<div id="'.$args['key'].'" class="info-box'.$class.'">'."\n"; |
|
| 588 | + if (isset($args['data']['name']) && ($args['data']['name'] != '')) { |
|
| 589 | + $html .= '<h3 class="title">'.esc_html($args['data']['name']).'</h3>'."\n"; |
|
| 590 | 590 | } |
| 591 | - if ( isset( $args['data']['description'] ) && ( $args['data']['description'] != '' ) ) { |
|
| 592 | - $html .= '<p>' . esc_html( $args['data']['description'] ) . '</p>' . "\n"; |
|
| 591 | + if (isset($args['data']['description']) && ($args['data']['description'] != '')) { |
|
| 592 | + $html .= '<p>'.esc_html($args['data']['description']).'</p>'."\n"; |
|
| 593 | 593 | } |
| 594 | - $html .= '</div>' . "\n"; |
|
| 594 | + $html .= '</div>'."\n"; |
|
| 595 | 595 | |
| 596 | 596 | echo $html; |
| 597 | 597 | } // End form_field_info() |
@@ -603,14 +603,14 @@ discard block |
||
| 603 | 603 | * @since 1.9.0 |
| 604 | 604 | * @param array $args |
| 605 | 605 | */ |
| 606 | - public function form_field_button( $args ) { |
|
| 606 | + public function form_field_button($args) { |
|
| 607 | 607 | $options = $this->get_settings(); |
| 608 | 608 | |
| 609 | - if ( isset( $args['data']['target'] ) && isset( $args['data']['label'] ) ) { |
|
| 610 | - printf( '<a href="%s" class="button button-secondary">%s</a> ', esc_url( $args['data']['target'] ), esc_html( $args['data']['label'] ) ); |
|
| 609 | + if (isset($args['data']['target']) && isset($args['data']['label'])) { |
|
| 610 | + printf('<a href="%s" class="button button-secondary">%s</a> ', esc_url($args['data']['target']), esc_html($args['data']['label'])); |
|
| 611 | 611 | |
| 612 | - if ( isset( $args['data']['description'] ) ) { |
|
| 613 | - echo '<span class="description">' . esc_html( $args['data']['description'] ) . '</span>' . "\n"; |
|
| 612 | + if (isset($args['data']['description'])) { |
|
| 613 | + echo '<span class="description">'.esc_html($args['data']['description']).'</span>'."\n"; |
|
| 614 | 614 | } |
| 615 | 615 | } |
| 616 | 616 | } // End form_field_button() |
@@ -624,23 +624,23 @@ discard block |
||
| 624 | 624 | * @uses $this->parse_errors() |
| 625 | 625 | * @return array $options |
| 626 | 626 | */ |
| 627 | - public function validate_fields ( $input ) { |
|
| 627 | + public function validate_fields($input) { |
|
| 628 | 628 | $options = $this->get_settings(); |
| 629 | 629 | |
| 630 | - foreach ( $this->fields as $k => $v ) { |
|
| 630 | + foreach ($this->fields as $k => $v) { |
|
| 631 | 631 | // Make sure checkboxes are present even when false. |
| 632 | - if ( $v['type'] == 'checkbox' && ! isset( $input[$k] ) ) { $input[$k] = false; } |
|
| 633 | - if ( $v['type'] == 'multicheck' && ! isset( $input[$k] ) ) { $input[$k] = false; } |
|
| 632 | + if ($v['type'] == 'checkbox' && ! isset($input[$k])) { $input[$k] = false; } |
|
| 633 | + if ($v['type'] == 'multicheck' && ! isset($input[$k])) { $input[$k] = false; } |
|
| 634 | 634 | |
| 635 | - if ( isset( $input[$k] ) ) { |
|
| 635 | + if (isset($input[$k])) { |
|
| 636 | 636 | // Perform checks on required fields. |
| 637 | - if ( isset( $v['required'] ) && ( $v['required'] == true ) ) { |
|
| 638 | - if ( in_array( $v['type'], $this->get_array_field_types() ) && ( count( (array) $input[$k] ) <= 0 ) ) { |
|
| 639 | - $this->add_error( $k, $v ); |
|
| 637 | + if (isset($v['required']) && ($v['required'] == true)) { |
|
| 638 | + if (in_array($v['type'], $this->get_array_field_types()) && (count((array) $input[$k]) <= 0)) { |
|
| 639 | + $this->add_error($k, $v); |
|
| 640 | 640 | continue; |
| 641 | 641 | } else { |
| 642 | - if ( $input[$k] == '' ) { |
|
| 643 | - $this->add_error( $k, $v ); |
|
| 642 | + if ($input[$k] == '') { |
|
| 643 | + $this->add_error($k, $v); |
|
| 644 | 644 | continue; |
| 645 | 645 | } |
| 646 | 646 | } |
@@ -649,28 +649,28 @@ discard block |
||
| 649 | 649 | $value = $input[$k]; |
| 650 | 650 | |
| 651 | 651 | // Check if the field is valid. |
| 652 | - $method = $this->determine_method( $v, 'check' ); |
|
| 652 | + $method = $this->determine_method($v, 'check'); |
|
| 653 | 653 | |
| 654 | - if ( function_exists ( $method ) ) { |
|
| 655 | - $is_valid = $method( $value ); |
|
| 654 | + if (function_exists($method)) { |
|
| 655 | + $is_valid = $method($value); |
|
| 656 | 656 | } else { |
| 657 | - if ( method_exists( $this, $method ) ) { |
|
| 658 | - $is_valid = $this->$method( $value ); |
|
| 657 | + if (method_exists($this, $method)) { |
|
| 658 | + $is_valid = $this->$method($value); |
|
| 659 | 659 | } |
| 660 | 660 | } |
| 661 | 661 | |
| 662 | - if ( ! $is_valid ) { |
|
| 663 | - $this->add_error( $k, $v ); |
|
| 662 | + if ( ! $is_valid) { |
|
| 663 | + $this->add_error($k, $v); |
|
| 664 | 664 | continue; |
| 665 | 665 | } |
| 666 | 666 | |
| 667 | - $method = $this->determine_method( $v, 'validate' ); |
|
| 667 | + $method = $this->determine_method($v, 'validate'); |
|
| 668 | 668 | |
| 669 | - if ( function_exists ( $method ) ) { |
|
| 670 | - $options[$k] = $method( $value ); |
|
| 669 | + if (function_exists($method)) { |
|
| 670 | + $options[$k] = $method($value); |
|
| 671 | 671 | } else { |
| 672 | - if ( method_exists( $this, $method ) ) { |
|
| 673 | - $options[$k] = $this->$method( $value ); |
|
| 672 | + if (method_exists($this, $method)) { |
|
| 673 | + $options[$k] = $this->$method($value); |
|
| 674 | 674 | } |
| 675 | 675 | } |
| 676 | 676 | } |
@@ -688,8 +688,8 @@ discard block |
||
| 688 | 688 | * @param string $input |
| 689 | 689 | * @return string |
| 690 | 690 | */ |
| 691 | - public function validate_field_text ( $input ) { |
|
| 692 | - return trim( esc_attr( $input ) ); |
|
| 691 | + public function validate_field_text($input) { |
|
| 692 | + return trim(esc_attr($input)); |
|
| 693 | 693 | } // End validate_field_text() |
| 694 | 694 | |
| 695 | 695 | /** |
@@ -699,11 +699,11 @@ discard block |
||
| 699 | 699 | * @param string $input |
| 700 | 700 | * @return string |
| 701 | 701 | */ |
| 702 | - public function validate_field_checkbox ( $input ) { |
|
| 703 | - if ( ! isset( $input ) ) { |
|
| 702 | + public function validate_field_checkbox($input) { |
|
| 703 | + if ( ! isset($input)) { |
|
| 704 | 704 | return 0; |
| 705 | 705 | } else { |
| 706 | - return (bool)$input; |
|
| 706 | + return (bool) $input; |
|
| 707 | 707 | } |
| 708 | 708 | } // End validate_field_checkbox() |
| 709 | 709 | |
@@ -714,10 +714,10 @@ discard block |
||
| 714 | 714 | * @param string $input |
| 715 | 715 | * @return string |
| 716 | 716 | */ |
| 717 | - public function validate_field_multicheck ( $input ) { |
|
| 717 | + public function validate_field_multicheck($input) { |
|
| 718 | 718 | $input = (array) $input; |
| 719 | 719 | |
| 720 | - $input = array_map( 'esc_attr', $input ); |
|
| 720 | + $input = array_map('esc_attr', $input); |
|
| 721 | 721 | |
| 722 | 722 | return $input; |
| 723 | 723 | } // End validate_field_multicheck() |
@@ -729,8 +729,8 @@ discard block |
||
| 729 | 729 | * @param string $input |
| 730 | 730 | * @return string |
| 731 | 731 | */ |
| 732 | - public function validate_field_range ( $input ) { |
|
| 733 | - $input = number_format( floatval( $input ), 0 ); |
|
| 732 | + public function validate_field_range($input) { |
|
| 733 | + $input = number_format(floatval($input), 0); |
|
| 734 | 734 | |
| 735 | 735 | return $input; |
| 736 | 736 | } // End validate_field_range() |
@@ -742,8 +742,8 @@ discard block |
||
| 742 | 742 | * @param string $input |
| 743 | 743 | * @return string |
| 744 | 744 | */ |
| 745 | - public function validate_field_url ( $input ) { |
|
| 746 | - return trim( esc_url( $input ) ); |
|
| 745 | + public function validate_field_url($input) { |
|
| 746 | + return trim(esc_url($input)); |
|
| 747 | 747 | } // End validate_field_url() |
| 748 | 748 | |
| 749 | 749 | /** |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | * @since 1.1.0 |
| 753 | 753 | * @return boolean Is the value valid? |
| 754 | 754 | */ |
| 755 | - public function check_field_text ( $input ) { |
|
| 755 | + public function check_field_text($input) { |
|
| 756 | 756 | $is_valid = true; |
| 757 | 757 | |
| 758 | 758 | return $is_valid; |
@@ -766,11 +766,11 @@ discard block |
||
| 766 | 766 | * @param array $data |
| 767 | 767 | * @return void |
| 768 | 768 | */ |
| 769 | - protected function add_error ( $key, $data ) { |
|
| 770 | - if ( isset( $data['error_message'] ) ) { |
|
| 769 | + protected function add_error($key, $data) { |
|
| 770 | + if (isset($data['error_message'])) { |
|
| 771 | 771 | $message = $data['error_message']; |
| 772 | 772 | } else { |
| 773 | - $message = sprintf( __( '%s is a required field', 'woothemes-sensei' ), $data['name'] ); |
|
| 773 | + $message = sprintf(__('%s is a required field', 'woothemes-sensei'), $data['name']); |
|
| 774 | 774 | } |
| 775 | 775 | $this->errors[$key] = $message; |
| 776 | 776 | } // End add_error() |
@@ -781,14 +781,14 @@ discard block |
||
| 781 | 781 | * @since 1.0.0 |
| 782 | 782 | * @return void |
| 783 | 783 | */ |
| 784 | - protected function parse_errors () { |
|
| 785 | - if ( count ( $this->errors ) > 0 ) { |
|
| 786 | - foreach ( $this->errors as $k => $v ) { |
|
| 787 | - add_settings_error( $this->token . '-errors', $k, $v, 'error' ); |
|
| 784 | + protected function parse_errors() { |
|
| 785 | + if (count($this->errors) > 0) { |
|
| 786 | + foreach ($this->errors as $k => $v) { |
|
| 787 | + add_settings_error($this->token.'-errors', $k, $v, 'error'); |
|
| 788 | 788 | } |
| 789 | 789 | } else { |
| 790 | - $message = sprintf( __( '%s updated', 'woothemes-sensei' ), $this->name ); |
|
| 791 | - add_settings_error( $this->token . '-errors', $this->token, $message, 'updated' ); |
|
| 790 | + $message = sprintf(__('%s updated', 'woothemes-sensei'), $this->name); |
|
| 791 | + add_settings_error($this->token.'-errors', $this->token, $message, 'updated'); |
|
| 792 | 792 | } |
| 793 | 793 | } // End parse_errors() |
| 794 | 794 | |
@@ -798,8 +798,8 @@ discard block |
||
| 798 | 798 | * @since 1.0.0 |
| 799 | 799 | * @return array |
| 800 | 800 | */ |
| 801 | - protected function get_array_field_types () { |
|
| 802 | - return array( 'multicheck' ); |
|
| 801 | + protected function get_array_field_types() { |
|
| 802 | + return array('multicheck'); |
|
| 803 | 803 | } // End get_array_field_types() |
| 804 | 804 | |
| 805 | 805 | /** |
@@ -808,21 +808,21 @@ discard block |
||
| 808 | 808 | * @since 1.0.0 |
| 809 | 809 | * @return void |
| 810 | 810 | */ |
| 811 | - public function enqueue_scripts () { |
|
| 811 | + public function enqueue_scripts() { |
|
| 812 | 812 | |
| 813 | - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
|
| 813 | + $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min'; |
|
| 814 | 814 | |
| 815 | - wp_enqueue_script( 'farbtastic' ); |
|
| 816 | - wp_enqueue_script( 'woothemes-sensei-settings', esc_url( Sensei()->plugin_url . 'assets/js/settings' . $suffix . '.js' ), array( 'jquery', 'farbtastic' ), Sensei()->version ); |
|
| 815 | + wp_enqueue_script('farbtastic'); |
|
| 816 | + wp_enqueue_script('woothemes-sensei-settings', esc_url(Sensei()->plugin_url.'assets/js/settings'.$suffix.'.js'), array('jquery', 'farbtastic'), Sensei()->version); |
|
| 817 | 817 | |
| 818 | - if ( $this->has_range ) { |
|
| 819 | - wp_enqueue_script( 'woothemes-sensei-settings-ranges', esc_url( Sensei()->plugin_url . 'assets/js/ranges' . $suffix . '.js' ), array( 'jquery-ui-slider' ), Sensei()->version ); |
|
| 818 | + if ($this->has_range) { |
|
| 819 | + wp_enqueue_script('woothemes-sensei-settings-ranges', esc_url(Sensei()->plugin_url.'assets/js/ranges'.$suffix.'.js'), array('jquery-ui-slider'), Sensei()->version); |
|
| 820 | 820 | } |
| 821 | 821 | |
| 822 | - wp_register_script( 'woothemes-sensei-settings-imageselectors', esc_url( Sensei()->plugin_url . 'assets/js/image-selectors' . $suffix . '.js' ), array( 'jquery' ), Sensei()->version ); |
|
| 822 | + wp_register_script('woothemes-sensei-settings-imageselectors', esc_url(Sensei()->plugin_url.'assets/js/image-selectors'.$suffix.'.js'), array('jquery'), Sensei()->version); |
|
| 823 | 823 | |
| 824 | - if ( $this->has_imageselector ) { |
|
| 825 | - wp_enqueue_script( 'woothemes-sensei-settings-imageselectors' ); |
|
| 824 | + if ($this->has_imageselector) { |
|
| 825 | + wp_enqueue_script('woothemes-sensei-settings-imageselectors'); |
|
| 826 | 826 | } |
| 827 | 827 | |
| 828 | 828 | } // End enqueue_scripts() |
@@ -833,12 +833,12 @@ discard block |
||
| 833 | 833 | * @since 1.0.0 |
| 834 | 834 | * @return void |
| 835 | 835 | */ |
| 836 | - public function enqueue_styles () { |
|
| 836 | + public function enqueue_styles() { |
|
| 837 | 837 | |
| 838 | - wp_enqueue_style( $this->token . '-admin' ); |
|
| 838 | + wp_enqueue_style($this->token.'-admin'); |
|
| 839 | 839 | |
| 840 | - wp_enqueue_style( 'farbtastic' ); |
|
| 841 | - wp_enqueue_style( 'woothemes-sensei-settings-api', esc_url( Sensei()->plugin_url . 'assets/css/settings.css' ), array( 'farbtastic' ), Sensei()->version ); |
|
| 840 | + wp_enqueue_style('farbtastic'); |
|
| 841 | + wp_enqueue_style('woothemes-sensei-settings-api', esc_url(Sensei()->plugin_url.'assets/css/settings.css'), array('farbtastic'), Sensei()->version); |
|
| 842 | 842 | |
| 843 | 843 | $this->enqueue_field_styles(); |
| 844 | 844 | } // End enqueue_styles() |
@@ -849,16 +849,16 @@ discard block |
||
| 849 | 849 | * @since 1.0.0 |
| 850 | 850 | * @return void |
| 851 | 851 | */ |
| 852 | - public function enqueue_field_styles () { |
|
| 852 | + public function enqueue_field_styles() { |
|
| 853 | 853 | |
| 854 | - if ( $this->has_range ) { |
|
| 855 | - wp_enqueue_style( 'woothemes-sensei-settings-ranges', esc_url( Sensei()->plugin_url . 'assets/css/ranges.css' ), '', Sensei()->version ); |
|
| 854 | + if ($this->has_range) { |
|
| 855 | + wp_enqueue_style('woothemes-sensei-settings-ranges', esc_url(Sensei()->plugin_url.'assets/css/ranges.css'), '', Sensei()->version); |
|
| 856 | 856 | } |
| 857 | 857 | |
| 858 | - wp_register_style( 'woothemes-sensei-settings-imageselectors', esc_url( Sensei()->plugin_url . 'assets/css/image-selectors.css' ), '', Sensei()->version ); |
|
| 858 | + wp_register_style('woothemes-sensei-settings-imageselectors', esc_url(Sensei()->plugin_url.'assets/css/image-selectors.css'), '', Sensei()->version); |
|
| 859 | 859 | |
| 860 | - if ( $this->has_imageselector ) { |
|
| 861 | - wp_enqueue_style( 'woothemes-sensei-settings-imageselectors' ); |
|
| 860 | + if ($this->has_imageselector) { |
|
| 861 | + wp_enqueue_style('woothemes-sensei-settings-imageselectors'); |
|
| 862 | 862 | } |
| 863 | 863 | } // End enqueue_field_styles() |
| 864 | 864 | } // End Class |
@@ -868,4 +868,4 @@ discard block |
||
| 868 | 868 | * @ignore only for backward compatibility |
| 869 | 869 | * @since 1.9.0 |
| 870 | 870 | */ |
| 871 | -class WooThemes_Sensei_Settings_API extends Sensei_Settings_API{} |
|
| 871 | +class WooThemes_Sensei_Settings_API extends Sensei_Settings_API {} |
|
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ){ exit; } // Exit if accessed directly |
|
| 2 | +if ( ! defined('ABSPATH')) { exit; } // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /*************************************************************************************************** |
| 5 | 5 | * Output tags. |
@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | * @param string $type (default: 'newcourses') |
| 13 | 13 | * @return void |
| 14 | 14 | */ |
| 15 | - function sensei_course_archive_next_link( $type = 'newcourses' ) { |
|
| 15 | + function sensei_course_archive_next_link($type = 'newcourses') { |
|
| 16 | 16 | |
| 17 | - _deprecated_function('sensei_course_archive_next_link', '1.9.0','This is no longer used or required in Sensei.'); |
|
| 17 | + _deprecated_function('sensei_course_archive_next_link', '1.9.0', 'This is no longer used or required in Sensei.'); |
|
| 18 | 18 | |
| 19 | 19 | } // End sensei_course_archive_next_link() |
| 20 | 20 | |
@@ -27,15 +27,15 @@ discard block |
||
| 27 | 27 | function course_single_lessons() { |
| 28 | 28 | |
| 29 | 29 | // load backwards compatible template name if it exists in the users theme |
| 30 | - $located_template= locate_template( Sensei()->template_url . 'single-course/course-lessons.php' ); |
|
| 31 | - if( $located_template ){ |
|
| 30 | + $located_template = locate_template(Sensei()->template_url.'single-course/course-lessons.php'); |
|
| 31 | + if ($located_template) { |
|
| 32 | 32 | |
| 33 | - Sensei_Templates::get_template( 'single-course/course-lessons.php' ); |
|
| 33 | + Sensei_Templates::get_template('single-course/course-lessons.php'); |
|
| 34 | 34 | return; |
| 35 | 35 | |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - Sensei_Templates::get_template( 'single-course/lessons.php' ); |
|
| 38 | + Sensei_Templates::get_template('single-course/lessons.php'); |
|
| 39 | 39 | |
| 40 | 40 | } // End course_single_lessons() |
| 41 | 41 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | function lesson_single_meta() { |
| 50 | 50 | |
| 51 | - _deprecated_function('lesson_single_meta','1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta' ); |
|
| 51 | + _deprecated_function('lesson_single_meta', '1.9;0', 'WooThemes_Sensei_Lesson::the_lesson_meta'); |
|
| 52 | 52 | sensei_the_single_lesson_meta(); |
| 53 | 53 | |
| 54 | 54 | } // End lesson_single_meta() |
@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | * @return void |
| 63 | 63 | * @deprecated since 1.9.0 |
| 64 | 64 | */ |
| 65 | - function quiz_questions( $return = false ) { |
|
| 65 | + function quiz_questions($return = false) { |
|
| 66 | 66 | |
| 67 | - Sensei_Templates::get_template( 'single-quiz/quiz-questions.php' ); |
|
| 67 | + Sensei_Templates::get_template('single-quiz/quiz-questions.php'); |
|
| 68 | 68 | |
| 69 | 69 | } // End quiz_questions() |
| 70 | 70 | |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | * @return void |
| 77 | 77 | * @deprecated |
| 78 | 78 | */ |
| 79 | - function quiz_question_type( $question_type = 'multiple-choice' ) { |
|
| 79 | + function quiz_question_type($question_type = 'multiple-choice') { |
|
| 80 | 80 | |
| 81 | - Sensei_Templates::get_template( 'single-quiz/question_type-' . $question_type . '.php' ); |
|
| 81 | + Sensei_Templates::get_template('single-quiz/question_type-'.$question_type.'.php'); |
|
| 82 | 82 | |
| 83 | 83 | } // End lesson_single_meta() |
| 84 | 84 | |
@@ -94,9 +94,9 @@ discard block |
||
| 94 | 94 | * @param mixed $course_id |
| 95 | 95 | * @return bool |
| 96 | 96 | */ |
| 97 | - function sensei_check_prerequisite_course( $course_id ) { |
|
| 97 | + function sensei_check_prerequisite_course($course_id) { |
|
| 98 | 98 | |
| 99 | - return Sensei_Course::is_prerequisite_complete( $course_id ); |
|
| 99 | + return Sensei_Course::is_prerequisite_complete($course_id); |
|
| 100 | 100 | |
| 101 | 101 | } // End sensei_check_prerequisite_course() |
| 102 | 102 | |
@@ -108,16 +108,16 @@ discard block |
||
| 108 | 108 | * @param mixed $course_id |
| 109 | 109 | * @return void |
| 110 | 110 | */ |
| 111 | - function sensei_start_course_form( $course_id ) { |
|
| 111 | + function sensei_start_course_form($course_id) { |
|
| 112 | 112 | |
| 113 | - $prerequisite_complete = sensei_check_prerequisite_course( $course_id ); |
|
| 113 | + $prerequisite_complete = sensei_check_prerequisite_course($course_id); |
|
| 114 | 114 | |
| 115 | - if ( $prerequisite_complete ) { |
|
| 116 | - ?><form method="POST" action="<?php echo esc_url( get_permalink() ); ?>"> |
|
| 115 | + if ($prerequisite_complete) { |
|
| 116 | + ?><form method="POST" action="<?php echo esc_url(get_permalink()); ?>"> |
|
| 117 | 117 | |
| 118 | - <input type="hidden" name="<?php echo esc_attr( 'woothemes_sensei_start_course_noonce' ); ?>" id="<?php echo esc_attr( 'woothemes_sensei_start_course_noonce' ); ?>" value="<?php echo esc_attr( wp_create_nonce( 'woothemes_sensei_start_course_noonce' ) ); ?>" /> |
|
| 118 | + <input type="hidden" name="<?php echo esc_attr('woothemes_sensei_start_course_noonce'); ?>" id="<?php echo esc_attr('woothemes_sensei_start_course_noonce'); ?>" value="<?php echo esc_attr(wp_create_nonce('woothemes_sensei_start_course_noonce')); ?>" /> |
|
| 119 | 119 | |
| 120 | - <span><input name="course_start" type="submit" class="course-start" value="<?php _e( 'Start taking this Course', 'woothemes-sensei' ); ?>"/></span> |
|
| 120 | + <span><input name="course_start" type="submit" class="course-start" value="<?php _e('Start taking this Course', 'woothemes-sensei'); ?>"/></span> |
|
| 121 | 121 | |
| 122 | 122 | </form><?php |
| 123 | 123 | } // End If Statement |
@@ -132,9 +132,9 @@ discard block |
||
| 132 | 132 | * @param mixed $course_id |
| 133 | 133 | * @return void |
| 134 | 134 | */ |
| 135 | - function sensei_wc_add_to_cart( $course_id ) { |
|
| 135 | + function sensei_wc_add_to_cart($course_id) { |
|
| 136 | 136 | |
| 137 | - Sensei_WC::the_add_to_cart_button_html( $course_id ); |
|
| 137 | + Sensei_WC::the_add_to_cart_button_html($course_id); |
|
| 138 | 138 | |
| 139 | 139 | } // End sensei_wc_add_to_cart() |
| 140 | 140 | |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | * @param int $wc_post_id (default: 0) |
| 147 | 147 | * @return bool |
| 148 | 148 | */ |
| 149 | - function sensei_check_if_product_is_in_cart( $wc_product_id = 0 ) { |
|
| 150 | - return Sensei_WC::is_product_in_cart( $wc_product_id ); |
|
| 149 | + function sensei_check_if_product_is_in_cart($wc_product_id = 0) { |
|
| 150 | + return Sensei_WC::is_product_in_cart($wc_product_id); |
|
| 151 | 151 | } // End sensei_check_if_product_is_in_cart() |
| 152 | 152 | |
| 153 | 153 | /** |
@@ -157,16 +157,16 @@ discard block |
||
| 157 | 157 | * @param mixed $post_id |
| 158 | 158 | * @return void |
| 159 | 159 | */ |
| 160 | - function sensei_simple_course_price( $post_id ) { |
|
| 160 | + function sensei_simple_course_price($post_id) { |
|
| 161 | 161 | |
| 162 | 162 | //WooCommerce Pricing |
| 163 | - if ( Sensei_WC::is_woocommerce_active() ) { |
|
| 164 | - $wc_post_id = get_post_meta( $post_id, '_course_woocommerce_product', true ); |
|
| 165 | - if ( 0 < $wc_post_id ) { |
|
| 163 | + if (Sensei_WC::is_woocommerce_active()) { |
|
| 164 | + $wc_post_id = get_post_meta($post_id, '_course_woocommerce_product', true); |
|
| 165 | + if (0 < $wc_post_id) { |
|
| 166 | 166 | // Get the product |
| 167 | - $product = Sensei()->sensei_get_woocommerce_product_object( $wc_post_id ); |
|
| 167 | + $product = Sensei()->sensei_get_woocommerce_product_object($wc_post_id); |
|
| 168 | 168 | |
| 169 | - if ( isset( $product ) && !empty( $product ) && $product->is_purchasable() && $product->is_in_stock() && !sensei_check_if_product_is_in_cart( $wc_post_id ) ) { ?> |
|
| 169 | + if (isset($product) && ! empty($product) && $product->is_purchasable() && $product->is_in_stock() && ! sensei_check_if_product_is_in_cart($wc_post_id)) { ?> |
|
| 170 | 170 | <span class="course-price"><?php echo $product->get_price_html(); ?></span> |
| 171 | 171 | <?php } // End If Statement |
| 172 | 172 | } // End If Statement |
@@ -180,11 +180,11 @@ discard block |
||
| 180 | 180 | * @param array $widget_args (default: array()) |
| 181 | 181 | * @return array |
| 182 | 182 | */ |
| 183 | - function sensei_recent_comments_widget_filter( $widget_args = array() ) { |
|
| 184 | - if ( ! isset( $widget_args['post_type'] ) ) $widget_args['post_type'] = array( 'post', 'page' ); |
|
| 183 | + function sensei_recent_comments_widget_filter($widget_args = array()) { |
|
| 184 | + if ( ! isset($widget_args['post_type'])) $widget_args['post_type'] = array('post', 'page'); |
|
| 185 | 185 | return $widget_args; |
| 186 | 186 | } // End sensei_recent_comments_widget_filter() |
| 187 | - add_filter( 'widget_comments_args', 'sensei_recent_comments_widget_filter', 10, 1 ); |
|
| 187 | + add_filter('widget_comments_args', 'sensei_recent_comments_widget_filter', 10, 1); |
|
| 188 | 188 | |
| 189 | 189 | /** |
| 190 | 190 | * sensei_course_archive_filter function. |
@@ -193,26 +193,26 @@ discard block |
||
| 193 | 193 | * @param WP_Query $query ( default: array ( ) ) |
| 194 | 194 | * @return void |
| 195 | 195 | */ |
| 196 | - function sensei_course_archive_filter( $query ) { |
|
| 196 | + function sensei_course_archive_filter($query) { |
|
| 197 | 197 | |
| 198 | 198 | |
| 199 | - if ( ! $query->is_main_query() ) |
|
| 199 | + if ( ! $query->is_main_query()) |
|
| 200 | 200 | return; |
| 201 | 201 | |
| 202 | 202 | // Apply Filter only if on frontend and when course archive is running |
| 203 | - $course_page_id = intval( Sensei()->settings->settings[ 'course_page' ] ); |
|
| 203 | + $course_page_id = intval(Sensei()->settings->settings['course_page']); |
|
| 204 | 204 | |
| 205 | - if ( ! is_admin() && 0 < $course_page_id && 0 < intval( $query->get( 'page_id' ) ) && $query->get( 'page_id' ) == $course_page_id ) { |
|
| 205 | + if ( ! is_admin() && 0 < $course_page_id && 0 < intval($query->get('page_id')) && $query->get('page_id') == $course_page_id) { |
|
| 206 | 206 | // Check for pagination settings |
| 207 | - if ( isset( Sensei()->settings->settings[ 'course_archive_amount' ] ) && ( 0 < absint( Sensei()->settings->settings[ 'course_archive_amount' ] ) ) ) { |
|
| 208 | - $amount = absint( Sensei()->settings->settings[ 'course_archive_amount' ] ); |
|
| 207 | + if (isset(Sensei()->settings->settings['course_archive_amount']) && (0 < absint(Sensei()->settings->settings['course_archive_amount']))) { |
|
| 208 | + $amount = absint(Sensei()->settings->settings['course_archive_amount']); |
|
| 209 | 209 | } else { |
| 210 | - $amount = $query->get( 'posts_per_page' ); |
|
| 210 | + $amount = $query->get('posts_per_page'); |
|
| 211 | 211 | } // End If Statement |
| 212 | - $query->set( 'posts_per_page', $amount ); |
|
| 212 | + $query->set('posts_per_page', $amount); |
|
| 213 | 213 | } // End If Statement |
| 214 | 214 | } // End sensei_course_archive_filter() |
| 215 | - add_filter( 'pre_get_posts', 'sensei_course_archive_filter', 10, 1 ); |
|
| 215 | + add_filter('pre_get_posts', 'sensei_course_archive_filter', 10, 1); |
|
| 216 | 216 | |
| 217 | 217 | /** |
| 218 | 218 | * sensei_complete_lesson_button description |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | * @return html |
| 221 | 221 | */ |
| 222 | 222 | function sensei_complete_lesson_button() { |
| 223 | - do_action( 'sensei_complete_lesson_button' ); |
|
| 223 | + do_action('sensei_complete_lesson_button'); |
|
| 224 | 224 | } // End sensei_complete_lesson_button() |
| 225 | 225 | |
| 226 | 226 | /** |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | * @return html |
| 230 | 230 | */ |
| 231 | 231 | function sensei_reset_lesson_button() { |
| 232 | - do_action( 'sensei_reset_lesson_button' ); |
|
| 232 | + do_action('sensei_reset_lesson_button'); |
|
| 233 | 233 | } // End sensei_reset_lesson_button() |
| 234 | 234 | |
| 235 | 235 | /** |
@@ -238,19 +238,19 @@ discard block |
||
| 238 | 238 | * @param integer $lesson_id |
| 239 | 239 | * @return array $return_values |
| 240 | 240 | */ |
| 241 | - function sensei_get_prev_next_lessons( $lesson_id = 0 ) { |
|
| 241 | + function sensei_get_prev_next_lessons($lesson_id = 0) { |
|
| 242 | 242 | |
| 243 | 243 | $return_values = array(); |
| 244 | 244 | $return_values['prev_lesson'] = 0; |
| 245 | 245 | $return_values['next_lesson'] = 0; |
| 246 | - if ( 0 < $lesson_id ) { |
|
| 246 | + if (0 < $lesson_id) { |
|
| 247 | 247 | // Get the List of Lessons in the Course |
| 248 | - $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true ); |
|
| 248 | + $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true); |
|
| 249 | 249 | $all_lessons = array(); |
| 250 | 250 | |
| 251 | - $modules = Sensei()->modules->get_course_modules( intval( $lesson_course_id ) ); |
|
| 251 | + $modules = Sensei()->modules->get_course_modules(intval($lesson_course_id)); |
|
| 252 | 252 | |
| 253 | - foreach( (array) $modules as $module ) { |
|
| 253 | + foreach ((array) $modules as $module) { |
|
| 254 | 254 | |
| 255 | 255 | $args = array( |
| 256 | 256 | 'post_type' => 'lesson', |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | 'meta_query' => array( |
| 260 | 260 | array( |
| 261 | 261 | 'key' => '_lesson_course', |
| 262 | - 'value' => intval( $lesson_course_id ), |
|
| 262 | + 'value' => intval($lesson_course_id), |
|
| 263 | 263 | 'compare' => '=' |
| 264 | 264 | ) |
| 265 | 265 | ), |
@@ -267,18 +267,18 @@ discard block |
||
| 267 | 267 | array( |
| 268 | 268 | 'taxonomy' => Sensei()->modules->taxonomy, |
| 269 | 269 | 'field' => 'id', |
| 270 | - 'terms' => intval( $module->term_id ) |
|
| 270 | + 'terms' => intval($module->term_id) |
|
| 271 | 271 | ) |
| 272 | 272 | ), |
| 273 | - 'meta_key' => '_order_module_' . $module->term_id, |
|
| 273 | + 'meta_key' => '_order_module_'.$module->term_id, |
|
| 274 | 274 | 'orderby' => 'meta_value_num date', |
| 275 | 275 | 'order' => 'ASC', |
| 276 | 276 | 'suppress_filters' => 0 |
| 277 | 277 | ); |
| 278 | 278 | |
| 279 | - $lessons = get_posts( $args ); |
|
| 280 | - if ( 0 < count( $lessons ) ) { |
|
| 281 | - foreach ($lessons as $lesson_item){ |
|
| 279 | + $lessons = get_posts($args); |
|
| 280 | + if (0 < count($lessons)) { |
|
| 281 | + foreach ($lessons as $lesson_item) { |
|
| 282 | 282 | $all_lessons[] = $lesson_item->ID; |
| 283 | 283 | } // End For Loop |
| 284 | 284 | } // End If Statement |
@@ -288,36 +288,36 @@ discard block |
||
| 288 | 288 | 'post_type' => 'lesson', |
| 289 | 289 | 'posts_per_page' => -1, |
| 290 | 290 | 'suppress_filters' => 0, |
| 291 | - 'meta_key' => '_order_' . $lesson_course_id, |
|
| 291 | + 'meta_key' => '_order_'.$lesson_course_id, |
|
| 292 | 292 | 'orderby' => 'meta_value_num date', |
| 293 | 293 | 'order' => 'ASC', |
| 294 | 294 | 'meta_query' => array( |
| 295 | 295 | array( |
| 296 | 296 | 'key' => '_lesson_course', |
| 297 | - 'value' => intval( $lesson_course_id ), |
|
| 297 | + 'value' => intval($lesson_course_id), |
|
| 298 | 298 | ), |
| 299 | 299 | ), |
| 300 | 300 | 'post__not_in' => $all_lessons, |
| 301 | 301 | ); |
| 302 | 302 | |
| 303 | - $other_lessons = get_posts( $args ); |
|
| 304 | - if ( 0 < count( $other_lessons ) ) { |
|
| 305 | - foreach ($other_lessons as $lesson_item){ |
|
| 303 | + $other_lessons = get_posts($args); |
|
| 304 | + if (0 < count($other_lessons)) { |
|
| 305 | + foreach ($other_lessons as $lesson_item) { |
|
| 306 | 306 | $all_lessons[] = $lesson_item->ID; |
| 307 | 307 | } // End For Loop |
| 308 | 308 | } // End If Statement |
| 309 | 309 | |
| 310 | - if ( 0 < count( $all_lessons ) ) { |
|
| 310 | + if (0 < count($all_lessons)) { |
|
| 311 | 311 | $found_index = false; |
| 312 | - foreach ( $all_lessons as $lesson ){ |
|
| 313 | - if ( $found_index && $return_values['next_lesson'] == 0 ) { |
|
| 312 | + foreach ($all_lessons as $lesson) { |
|
| 313 | + if ($found_index && $return_values['next_lesson'] == 0) { |
|
| 314 | 314 | $return_values['next_lesson'] = $lesson; |
| 315 | 315 | } // End If Statement |
| 316 | - if ( $lesson == $lesson_id ) { |
|
| 316 | + if ($lesson == $lesson_id) { |
|
| 317 | 317 | // Is the current post |
| 318 | 318 | $found_index = true; |
| 319 | 319 | } // End If Statement |
| 320 | - if ( !$found_index ) { |
|
| 320 | + if ( ! $found_index) { |
|
| 321 | 321 | $return_values['prev_lesson'] = $lesson; |
| 322 | 322 | } // End If Statement |
| 323 | 323 | } // End For Loop |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | * @param int|WP_Post $post_id Optional. Defaults to current post |
| 337 | 337 | * @return string $excerpt |
| 338 | 338 | */ |
| 339 | - function sensei_get_excerpt( $post_id = '' ) { |
|
| 339 | + function sensei_get_excerpt($post_id = '') { |
|
| 340 | 340 | |
| 341 | 341 | global $post; |
| 342 | 342 | _deprecated_function('sensei_get_excerpt', 'use the wordpress excerpt functionality.'); |
@@ -344,14 +344,14 @@ discard block |
||
| 344 | 344 | |
| 345 | 345 | } |
| 346 | 346 | |
| 347 | - function sensei_has_user_started_course( $post_id = 0, $user_id = 0 ) { |
|
| 348 | - _deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_started_course()" ); |
|
| 349 | - return Sensei_Utils::user_started_course( $post_id, $user_id ); |
|
| 347 | + function sensei_has_user_started_course($post_id = 0, $user_id = 0) { |
|
| 348 | + _deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_started_course()"); |
|
| 349 | + return Sensei_Utils::user_started_course($post_id, $user_id); |
|
| 350 | 350 | } // End sensei_has_user_started_course() |
| 351 | 351 | |
| 352 | - function sensei_has_user_completed_lesson( $post_id = 0, $user_id = 0 ) { |
|
| 353 | - _deprecated_function( __FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()" ); |
|
| 354 | - return Sensei_Utils::user_completed_lesson( $post_id, $user_id ); |
|
| 352 | + function sensei_has_user_completed_lesson($post_id = 0, $user_id = 0) { |
|
| 353 | + _deprecated_function(__FUNCTION__, '1.7', "WooThemes_Sensei_Utils::user_completed_lesson()"); |
|
| 354 | + return Sensei_Utils::user_completed_lesson($post_id, $user_id); |
|
| 355 | 355 | } // End sensei_has_user_completed_lesson() |
| 356 | 356 | |
| 357 | 357 | /** |
@@ -363,9 +363,9 @@ discard block |
||
| 363 | 363 | * @param int $user_id |
| 364 | 364 | * @return bool |
| 365 | 365 | */ |
| 366 | -function sensei_has_user_completed_prerequisite_lesson( $current_lesson_id, $user_id ) { |
|
| 366 | +function sensei_has_user_completed_prerequisite_lesson($current_lesson_id, $user_id) { |
|
| 367 | 367 | |
| 368 | - return WooThemes_Sensei_Lesson::is_pre_requisite_complete( $current_lesson_id, $user_id ); |
|
| 368 | + return WooThemes_Sensei_Lesson::is_pre_requisite_complete($current_lesson_id, $user_id); |
|
| 369 | 369 | |
| 370 | 370 | } // End sensei_has_user_completed_prerequisite_lesson() |
| 371 | 371 | |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | * @return bool |
| 389 | 389 | * |
| 390 | 390 | */ |
| 391 | -function sensei_have_modules( $course_post_id = '' ){ |
|
| 391 | +function sensei_have_modules($course_post_id = '') { |
|
| 392 | 392 | |
| 393 | 393 | global $post, $wp_query, $sensei_modules_loop; |
| 394 | 394 | |
@@ -396,23 +396,23 @@ discard block |
||
| 396 | 396 | wp_reset_query(); |
| 397 | 397 | $post = $wp_query->post; |
| 398 | 398 | |
| 399 | - if( empty( $course_post_id ) ){ |
|
| 399 | + if (empty($course_post_id)) { |
|
| 400 | 400 | |
| 401 | 401 | $course_id = $post->ID; |
| 402 | 402 | |
| 403 | 403 | } |
| 404 | 404 | |
| 405 | 405 | // doesn't apply to none course post types |
| 406 | - if( ! sensei_is_a_course( $course_id ) ){ |
|
| 406 | + if ( ! sensei_is_a_course($course_id)) { |
|
| 407 | 407 | return false; |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | // check the current item compared to the total number of modules |
| 411 | - if( $sensei_modules_loop[ 'current' ] + 1 > $sensei_modules_loop[ 'total' ] ){ |
|
| 411 | + if ($sensei_modules_loop['current'] + 1 > $sensei_modules_loop['total']) { |
|
| 412 | 412 | |
| 413 | 413 | return false; |
| 414 | 414 | |
| 415 | - }else{ |
|
| 415 | + } else { |
|
| 416 | 416 | |
| 417 | 417 | return true; |
| 418 | 418 | |
@@ -426,27 +426,27 @@ discard block |
||
| 426 | 426 | * |
| 427 | 427 | * @since 1.9.0 |
| 428 | 428 | */ |
| 429 | -function sensei_setup_module(){ |
|
| 429 | +function sensei_setup_module() { |
|
| 430 | 430 | |
| 431 | 431 | global $sensei_modules_loop, $wp_query; |
| 432 | 432 | |
| 433 | 433 | // increment the index |
| 434 | - $sensei_modules_loop[ 'current' ]++; |
|
| 435 | - $index = $sensei_modules_loop[ 'current' ]; |
|
| 436 | - if( isset( $sensei_modules_loop['modules'][ $index ] ) ) { |
|
| 434 | + $sensei_modules_loop['current']++; |
|
| 435 | + $index = $sensei_modules_loop['current']; |
|
| 436 | + if (isset($sensei_modules_loop['modules'][$index])) { |
|
| 437 | 437 | |
| 438 | 438 | $sensei_modules_loop['current_module'] = $sensei_modules_loop['modules'][$index]; |
| 439 | 439 | // setup the query for the module lessons |
| 440 | 440 | $course_id = $sensei_modules_loop['course_id']; |
| 441 | 441 | $module_term_id = $sensei_modules_loop['current_module']->term_id; |
| 442 | - $modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id ); |
|
| 442 | + $modules_query = Sensei()->modules->get_lessons_query($course_id, $module_term_id); |
|
| 443 | 443 | |
| 444 | 444 | // setup the global wp-query only if the lessons |
| 445 | - if( $modules_query->have_posts() ){ |
|
| 445 | + if ($modules_query->have_posts()) { |
|
| 446 | 446 | |
| 447 | 447 | $wp_query = $modules_query; |
| 448 | 448 | |
| 449 | - }else{ |
|
| 449 | + } else { |
|
| 450 | 450 | |
| 451 | 451 | wp_reset_query(); |
| 452 | 452 | |
@@ -470,30 +470,30 @@ discard block |
||
| 470 | 470 | * |
| 471 | 471 | * @return bool |
| 472 | 472 | */ |
| 473 | -function sensei_module_has_lessons(){ |
|
| 473 | +function sensei_module_has_lessons() { |
|
| 474 | 474 | |
| 475 | 475 | global $wp_query, $sensei_modules_loop; |
| 476 | 476 | |
| 477 | - if( 'lesson' == $wp_query->get('post_type') ){ |
|
| 477 | + if ('lesson' == $wp_query->get('post_type')) { |
|
| 478 | 478 | |
| 479 | 479 | return have_posts(); |
| 480 | 480 | |
| 481 | - }else{ |
|
| 481 | + } else { |
|
| 482 | 482 | |
| 483 | 483 | // if the loop has not been initiated check the first module has lessons |
| 484 | - if( -1 == $sensei_modules_loop[ 'current' ] ){ |
|
| 484 | + if ( -1 == $sensei_modules_loop['current'] ) { |
|
| 485 | 485 | |
| 486 | 486 | $index = 0; |
| 487 | 487 | |
| 488 | - if( isset( $sensei_modules_loop['modules'][ $index ] ) ) { |
|
| 488 | + if (isset($sensei_modules_loop['modules'][$index])) { |
|
| 489 | 489 | // setup the query for the module lessons |
| 490 | 490 | $course_id = $sensei_modules_loop['course_id']; |
| 491 | 491 | |
| 492 | - $module_term_id = $sensei_modules_loop['modules'][ $index ] ->term_id; |
|
| 493 | - $modules_query = Sensei()->modules->get_lessons_query( $course_id , $module_term_id ); |
|
| 492 | + $module_term_id = $sensei_modules_loop['modules'][$index] ->term_id; |
|
| 493 | + $modules_query = Sensei()->modules->get_lessons_query($course_id, $module_term_id); |
|
| 494 | 494 | |
| 495 | 495 | // setup the global wp-query only if the lessons |
| 496 | - if( $modules_query->have_posts() ){ |
|
| 496 | + if ($modules_query->have_posts()) { |
|
| 497 | 497 | |
| 498 | 498 | return true; |
| 499 | 499 | |
@@ -517,9 +517,9 @@ discard block |
||
| 517 | 517 | * @uses sensei_the_module_title |
| 518 | 518 | * @return string |
| 519 | 519 | */ |
| 520 | -function sensei_the_module_title_attribute(){ |
|
| 520 | +function sensei_the_module_title_attribute() { |
|
| 521 | 521 | |
| 522 | - esc_attr_e( sensei_get_the_module_title() ); |
|
| 522 | + esc_attr_e(sensei_get_the_module_title()); |
|
| 523 | 523 | |
| 524 | 524 | } |
| 525 | 525 | |
@@ -530,11 +530,11 @@ discard block |
||
| 530 | 530 | * |
| 531 | 531 | * @return string |
| 532 | 532 | */ |
| 533 | -function sensei_the_module_permalink(){ |
|
| 533 | +function sensei_the_module_permalink() { |
|
| 534 | 534 | |
| 535 | 535 | global $sensei_modules_loop; |
| 536 | 536 | $course_id = $sensei_modules_loop['course_id']; |
| 537 | - $module_url = add_query_arg('course_id', $course_id, get_term_link( $sensei_modules_loop['current_module'], 'module' ) ); |
|
| 537 | + $module_url = add_query_arg('course_id', $course_id, get_term_link($sensei_modules_loop['current_module'], 'module')); |
|
| 538 | 538 | $module_term_id = $sensei_modules_loop['current_module']->term_id; |
| 539 | 539 | |
| 540 | 540 | /** |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | * @param int $module_term_id |
| 547 | 547 | * @param string $course_id |
| 548 | 548 | */ |
| 549 | - echo esc_url_raw( apply_filters( 'sensei_the_module_permalink', $module_url, $module_term_id ,$course_id ) ); |
|
| 549 | + echo esc_url_raw(apply_filters('sensei_the_module_permalink', $module_url, $module_term_id, $course_id)); |
|
| 550 | 550 | |
| 551 | 551 | }// end sensei_the_module_permalink |
| 552 | 552 | |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | * |
| 559 | 559 | * @return string |
| 560 | 560 | */ |
| 561 | -function sensei_get_the_module_title(){ |
|
| 561 | +function sensei_get_the_module_title() { |
|
| 562 | 562 | |
| 563 | 563 | global $sensei_modules_loop; |
| 564 | 564 | |
@@ -577,7 +577,7 @@ discard block |
||
| 577 | 577 | * @param $module_term_id |
| 578 | 578 | * @param $course_id |
| 579 | 579 | */ |
| 580 | - return apply_filters( 'sensei_the_module_title', $module_title , $module_term_id, $course_id ); |
|
| 580 | + return apply_filters('sensei_the_module_title', $module_title, $module_term_id, $course_id); |
|
| 581 | 581 | |
| 582 | 582 | } |
| 583 | 583 | |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | * @uses sensei_get_the_module_title |
| 590 | 590 | * @return string |
| 591 | 591 | */ |
| 592 | -function sensei_the_module_title(){ |
|
| 592 | +function sensei_the_module_title() { |
|
| 593 | 593 | |
| 594 | 594 | echo sensei_get_the_module_title(); |
| 595 | 595 | |
@@ -610,19 +610,19 @@ discard block |
||
| 610 | 610 | * |
| 611 | 611 | * @return bool |
| 612 | 612 | */ |
| 613 | -function sensei_quiz_has_questions(){ |
|
| 613 | +function sensei_quiz_has_questions() { |
|
| 614 | 614 | |
| 615 | 615 | global $sensei_question_loop; |
| 616 | 616 | |
| 617 | - if( !isset( $sensei_question_loop['total'] ) ){ |
|
| 617 | + if ( ! isset($sensei_question_loop['total'])) { |
|
| 618 | 618 | return false; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | - if( $sensei_question_loop['current'] + 1 < $sensei_question_loop['total'] ){ |
|
| 621 | + if ($sensei_question_loop['current'] + 1 < $sensei_question_loop['total']) { |
|
| 622 | 622 | |
| 623 | 623 | return true; |
| 624 | 624 | |
| 625 | - }else{ |
|
| 625 | + } else { |
|
| 626 | 626 | |
| 627 | 627 | return false; |
| 628 | 628 | |
@@ -639,13 +639,13 @@ discard block |
||
| 639 | 639 | * @since 1.9.0 |
| 640 | 640 | |
| 641 | 641 | */ |
| 642 | -function sensei_setup_the_question(){ |
|
| 642 | +function sensei_setup_the_question() { |
|
| 643 | 643 | |
| 644 | 644 | global $sensei_question_loop; |
| 645 | 645 | |
| 646 | 646 | $sensei_question_loop['current']++; |
| 647 | 647 | $index = $sensei_question_loop['current']; |
| 648 | - $sensei_question_loop['current_question'] = $sensei_question_loop['questions'][ $index ] ; |
|
| 648 | + $sensei_question_loop['current_question'] = $sensei_question_loop['questions'][$index]; |
|
| 649 | 649 | |
| 650 | 650 | |
| 651 | 651 | }// end sensei_setup_the_question |
@@ -656,14 +656,14 @@ discard block |
||
| 656 | 656 | * This function gets the type and loads the template that will handle it. |
| 657 | 657 | * |
| 658 | 658 | */ |
| 659 | -function sensei_the_question_content(){ |
|
| 659 | +function sensei_the_question_content() { |
|
| 660 | 660 | |
| 661 | 661 | global $sensei_question_loop; |
| 662 | 662 | |
| 663 | - $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID ); |
|
| 663 | + $question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID); |
|
| 664 | 664 | |
| 665 | 665 | // load the template that displays the question information. |
| 666 | - WooThemes_Sensei_Question::load_question_template( $question_type ); |
|
| 666 | + WooThemes_Sensei_Question::load_question_template($question_type); |
|
| 667 | 667 | |
| 668 | 668 | }// end sensei_the_question_content |
| 669 | 669 | |
@@ -672,11 +672,11 @@ discard block |
||
| 672 | 672 | * |
| 673 | 673 | * @since 1.9.0 |
| 674 | 674 | */ |
| 675 | -function sensei_the_question_class(){ |
|
| 675 | +function sensei_the_question_class() { |
|
| 676 | 676 | |
| 677 | 677 | global $sensei_question_loop; |
| 678 | 678 | |
| 679 | - $question_type = Sensei()->question->get_question_type( $sensei_question_loop['current_question']->ID ); |
|
| 679 | + $question_type = Sensei()->question->get_question_type($sensei_question_loop['current_question']->ID); |
|
| 680 | 680 | |
| 681 | 681 | /** |
| 682 | 682 | * filter the sensei question class within |
@@ -684,16 +684,16 @@ discard block |
||
| 684 | 684 | * |
| 685 | 685 | * @since 1.9.0 |
| 686 | 686 | */ |
| 687 | - $classes = apply_filters( 'sensei_question_classes', array( $question_type ) ); |
|
| 687 | + $classes = apply_filters('sensei_question_classes', array($question_type)); |
|
| 688 | 688 | |
| 689 | 689 | $html_classes = ''; |
| 690 | - foreach( $classes as $class ){ |
|
| 690 | + foreach ($classes as $class) { |
|
| 691 | 691 | |
| 692 | - $html_classes .= $class . ' '; |
|
| 692 | + $html_classes .= $class.' '; |
|
| 693 | 693 | |
| 694 | 694 | }// end foreach |
| 695 | 695 | |
| 696 | - esc_attr_e( trim( $html_classes ) ); |
|
| 696 | + esc_attr_e(trim($html_classes)); |
|
| 697 | 697 | |
| 698 | 698 | } |
| 699 | 699 | |
@@ -702,10 +702,10 @@ discard block |
||
| 702 | 702 | * |
| 703 | 703 | * @since 1.9.0 |
| 704 | 704 | */ |
| 705 | -function sensei_get_the_question_id( ){ |
|
| 705 | +function sensei_get_the_question_id( ) { |
|
| 706 | 706 | |
| 707 | 707 | global $sensei_question_loop; |
| 708 | - if( isset( $sensei_question_loop['current_question']->ID ) ){ |
|
| 708 | + if (isset($sensei_question_loop['current_question']->ID)) { |
|
| 709 | 709 | |
| 710 | 710 | return $sensei_question_loop['current_question']->ID; |
| 711 | 711 | |
@@ -734,27 +734,27 @@ discard block |
||
| 734 | 734 | * @param string $lesson_id |
| 735 | 735 | * @return bool |
| 736 | 736 | */ |
| 737 | -function sensei_can_user_view_lesson( $lesson_id = '', $user_id = '' ){ |
|
| 737 | +function sensei_can_user_view_lesson($lesson_id = '', $user_id = '') { |
|
| 738 | 738 | |
| 739 | - if( empty( $lesson_id ) ){ |
|
| 739 | + if (empty($lesson_id)) { |
|
| 740 | 740 | |
| 741 | 741 | $lesson_id = get_the_ID(); |
| 742 | 742 | |
| 743 | 743 | } |
| 744 | 744 | |
| 745 | - if( empty( $user_id ) ){ |
|
| 745 | + if (empty($user_id)) { |
|
| 746 | 746 | |
| 747 | 747 | $user_id = get_current_user_id(); |
| 748 | 748 | |
| 749 | 749 | } |
| 750 | 750 | |
| 751 | 751 | // Check for prerequisite lesson completions |
| 752 | - $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete( $lesson_id, $user_id ); |
|
| 753 | - $lesson_course_id = get_post_meta( $lesson_id, '_lesson_course', true ); |
|
| 754 | - $user_taking_course = Sensei_Utils::user_started_course( $lesson_course_id, $user_id ); |
|
| 752 | + $pre_requisite_complete = WooThemes_Sensei_Lesson::is_prerequisite_complete($lesson_id, $user_id); |
|
| 753 | + $lesson_course_id = get_post_meta($lesson_id, '_lesson_course', true); |
|
| 754 | + $user_taking_course = Sensei_Utils::user_started_course($lesson_course_id, $user_id); |
|
| 755 | 755 | |
| 756 | 756 | $is_preview = false; |
| 757 | - if( Sensei_Utils::is_preview_lesson( $lesson_id ) ) { |
|
| 757 | + if (Sensei_Utils::is_preview_lesson($lesson_id)) { |
|
| 758 | 758 | |
| 759 | 759 | $is_preview = true; |
| 760 | 760 | $pre_requisite_complete = true; |
@@ -762,24 +762,24 @@ discard block |
||
| 762 | 762 | }; |
| 763 | 763 | |
| 764 | 764 | |
| 765 | - $user_can_access_lesson = false; |
|
| 765 | + $user_can_access_lesson = false; |
|
| 766 | 766 | |
| 767 | - if( is_user_logged_in() && $user_taking_course ){ |
|
| 767 | + if (is_user_logged_in() && $user_taking_course) { |
|
| 768 | 768 | |
| 769 | - $user_can_access_lesson = true; |
|
| 769 | + $user_can_access_lesson = true; |
|
| 770 | 770 | |
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | |
| 774 | 774 | $access_permission = false; |
| 775 | 775 | |
| 776 | - if ( ! Sensei()->settings->get('access_permission') || sensei_all_access() ) { |
|
| 776 | + if ( ! Sensei()->settings->get('access_permission') || sensei_all_access()) { |
|
| 777 | 777 | |
| 778 | 778 | $access_permission = true; |
| 779 | 779 | |
| 780 | 780 | } |
| 781 | 781 | |
| 782 | - $can_user_view_lesson = $access_permission || ( $user_can_access_lesson && $pre_requisite_complete ) || $is_preview; |
|
| 782 | + $can_user_view_lesson = $access_permission || ($user_can_access_lesson && $pre_requisite_complete) || $is_preview; |
|
| 783 | 783 | |
| 784 | 784 | /** |
| 785 | 785 | * Filter the can user view lesson function |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | * @param string $lesson_id |
| 793 | 793 | * @param string $user_id |
| 794 | 794 | */ |
| 795 | - return apply_filters( 'sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id ); |
|
| 795 | + return apply_filters('sensei_can_user_view_lesson', $can_user_view_lesson, $lesson_id, $user_id); |
|
| 796 | 796 | |
| 797 | 797 | } // end sensei_can_current_user_view_lesson |
| 798 | 798 | |
@@ -802,54 +802,54 @@ discard block |
||
| 802 | 802 | * The function should only be called on the single lesson |
| 803 | 803 | * |
| 804 | 804 | */ |
| 805 | -function sensei_the_single_lesson_meta(){ |
|
| 805 | +function sensei_the_single_lesson_meta() { |
|
| 806 | 806 | |
| 807 | 807 | // if the lesson meta is included within theme load that instead of the function content |
| 808 | - $template = Sensei_Templates::locate_template( 'single-lesson/lesson-meta.php' ); |
|
| 809 | - if( ! empty( $template ) ){ |
|
| 808 | + $template = Sensei_Templates::locate_template('single-lesson/lesson-meta.php'); |
|
| 809 | + if ( ! empty($template)) { |
|
| 810 | 810 | |
| 811 | - Sensei_Templates::get_template( 'single-lesson/lesson-meta.php' ); |
|
| 811 | + Sensei_Templates::get_template('single-lesson/lesson-meta.php'); |
|
| 812 | 812 | return; |
| 813 | 813 | |
| 814 | 814 | } |
| 815 | 815 | |
| 816 | 816 | // Get the meta info |
| 817 | - $lesson_course_id = absint( get_post_meta( get_the_ID(), '_lesson_course', true ) ); |
|
| 818 | - $is_preview = Sensei_Utils::is_preview_lesson( get_the_ID() ); |
|
| 817 | + $lesson_course_id = absint(get_post_meta(get_the_ID(), '_lesson_course', true)); |
|
| 818 | + $is_preview = Sensei_Utils::is_preview_lesson(get_the_ID()); |
|
| 819 | 819 | |
| 820 | 820 | // Get User Meta |
| 821 | 821 | get_currentuserinfo(); |
| 822 | 822 | |
| 823 | 823 | // Complete Lesson Logic |
| 824 | - do_action( 'sensei_complete_lesson' ); |
|
| 824 | + do_action('sensei_complete_lesson'); |
|
| 825 | 825 | // Check that the course has been started |
| 826 | - if ( Sensei()->access_settings() |
|
| 827 | - || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) |
|
| 828 | - || $is_preview ) { |
|
| 826 | + if (Sensei()->access_settings() |
|
| 827 | + || Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id()) |
|
| 828 | + || $is_preview) { |
|
| 829 | 829 | ?> |
| 830 | 830 | <section class="lesson-meta"> |
| 831 | 831 | <?php |
| 832 | - if( apply_filters( 'sensei_video_position', 'top', get_the_ID() ) == 'bottom' ) { |
|
| 832 | + if (apply_filters('sensei_video_position', 'top', get_the_ID()) == 'bottom') { |
|
| 833 | 833 | |
| 834 | - do_action( 'sensei_lesson_video', get_the_ID() ); |
|
| 834 | + do_action('sensei_lesson_video', get_the_ID()); |
|
| 835 | 835 | |
| 836 | 836 | } |
| 837 | 837 | ?> |
| 838 | - <?php do_action( 'sensei_frontend_messages' ); ?> |
|
| 838 | + <?php do_action('sensei_frontend_messages'); ?> |
|
| 839 | 839 | |
| 840 | 840 | <?php if ( ! $is_preview |
| 841 | - || Sensei_Utils::user_started_course( $lesson_course_id, get_current_user_id()) ) { |
|
| 841 | + || Sensei_Utils::user_started_course($lesson_course_id, get_current_user_id())) { |
|
| 842 | 842 | |
| 843 | - sensei_do_deprecated_action( 'sensei_lesson_quiz_meta','1.9.0', 'sensei_single_lesson_content_inside_before' ,array( get_the_ID(), get_current_user_id() ) ); |
|
| 843 | + sensei_do_deprecated_action('sensei_lesson_quiz_meta', '1.9.0', 'sensei_single_lesson_content_inside_before', array(get_the_ID(), get_current_user_id())); |
|
| 844 | 844 | |
| 845 | 845 | } ?> |
| 846 | 846 | </section> |
| 847 | 847 | |
| 848 | - <?php do_action( 'sensei_lesson_back_link', $lesson_course_id ); ?> |
|
| 848 | + <?php do_action('sensei_lesson_back_link', $lesson_course_id); ?> |
|
| 849 | 849 | |
| 850 | 850 | <?php } |
| 851 | 851 | |
| 852 | - do_action( 'sensei_lesson_meta_extra', get_the_ID() ); |
|
| 852 | + do_action('sensei_lesson_meta_extra', get_the_ID()); |
|
| 853 | 853 | |
| 854 | 854 | } // end the_single_lesson_meta |
| 855 | 855 | |
@@ -863,9 +863,9 @@ discard block |
||
| 863 | 863 | * |
| 864 | 864 | * @since 1.9.0 |
| 865 | 865 | */ |
| 866 | -function get_sensei_header(){ |
|
| 866 | +function get_sensei_header() { |
|
| 867 | 867 | |
| 868 | - if ( ! defined( 'ABSPATH' ) ) exit; |
|
| 868 | + if ( ! defined('ABSPATH')) exit; |
|
| 869 | 869 | |
| 870 | 870 | get_header(); |
| 871 | 871 | |
@@ -874,7 +874,7 @@ discard block |
||
| 874 | 874 | * |
| 875 | 875 | * @hooked sensei_output_content_wrapper - 10 (outputs opening divs for the content) |
| 876 | 876 | */ |
| 877 | - do_action( 'sensei_before_main_content' ); |
|
| 877 | + do_action('sensei_before_main_content'); |
|
| 878 | 878 | |
| 879 | 879 | }// end get_sensei_header |
| 880 | 880 | |
@@ -888,28 +888,28 @@ discard block |
||
| 888 | 888 | * |
| 889 | 889 | * @since 1.9.0 |
| 890 | 890 | */ |
| 891 | -function get_sensei_footer(){ |
|
| 891 | +function get_sensei_footer() { |
|
| 892 | 892 | |
| 893 | 893 | /** |
| 894 | 894 | * sensei_pagination hook |
| 895 | 895 | * |
| 896 | 896 | * @hooked sensei_pagination - 10 (outputs pagination) |
| 897 | 897 | */ |
| 898 | - do_action( 'sensei_pagination' ); |
|
| 898 | + do_action('sensei_pagination'); |
|
| 899 | 899 | |
| 900 | 900 | /** |
| 901 | 901 | * sensei_after_main_content hook |
| 902 | 902 | * |
| 903 | 903 | * @hooked sensei_output_content_wrapper_end - 10 (outputs closing divs for the content) |
| 904 | 904 | */ |
| 905 | - do_action( 'sensei_after_main_content' ); |
|
| 905 | + do_action('sensei_after_main_content'); |
|
| 906 | 906 | |
| 907 | 907 | /** |
| 908 | 908 | * sensei_sidebar hook |
| 909 | 909 | * |
| 910 | 910 | * @hooked sensei_get_sidebar - 10 |
| 911 | 911 | */ |
| 912 | - do_action( 'sensei_sidebar' ); |
|
| 912 | + do_action('sensei_sidebar'); |
|
| 913 | 913 | |
| 914 | 914 | get_footer(); |
| 915 | 915 | |
@@ -921,7 +921,7 @@ discard block |
||
| 921 | 921 | * |
| 922 | 922 | * @since 1.9.0 |
| 923 | 923 | */ |
| 924 | -function the_no_permissions_title(){ |
|
| 924 | +function the_no_permissions_title() { |
|
| 925 | 925 | |
| 926 | 926 | /** |
| 927 | 927 | * Filter the no permissions title just before it is echo'd on the |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | * @since 1.9.0 |
| 931 | 931 | * @param $no_permissions_title |
| 932 | 932 | */ |
| 933 | - echo apply_filters( 'sensei_the_no_permissions_title', Sensei()->permissions_message['title'] ); |
|
| 933 | + echo apply_filters('sensei_the_no_permissions_title', Sensei()->permissions_message['title']); |
|
| 934 | 934 | |
| 935 | 935 | } |
| 936 | 936 | |
@@ -939,7 +939,7 @@ discard block |
||
| 939 | 939 | * |
| 940 | 940 | * @since 1.9.0 |
| 941 | 941 | */ |
| 942 | -function the_no_permissions_message( $post_id ){ |
|
| 942 | +function the_no_permissions_message($post_id) { |
|
| 943 | 943 | |
| 944 | 944 | /** |
| 945 | 945 | * Filter the no permissions message just before it is echo'd on the |
@@ -948,7 +948,7 @@ discard block |
||
| 948 | 948 | * @since 1.9.0 |
| 949 | 949 | * @param $no_permissions_message |
| 950 | 950 | */ |
| 951 | - echo apply_filters( 'sensei_the_no_permissions_message', Sensei()->permissions_message['message'] , $post_id ); |
|
| 951 | + echo apply_filters('sensei_the_no_permissions_message', Sensei()->permissions_message['message'], $post_id); |
|
| 952 | 952 | |
| 953 | 953 | } |
| 954 | 954 | |
@@ -957,10 +957,10 @@ discard block |
||
| 957 | 957 | * |
| 958 | 958 | * @since 1.9.0 |
| 959 | 959 | */ |
| 960 | -function sensei_the_excerpt( $post_id ){ |
|
| 960 | +function sensei_the_excerpt($post_id) { |
|
| 961 | 961 | |
| 962 | 962 | global $post; |
| 963 | - the_excerpt( $post ); |
|
| 963 | + the_excerpt($post); |
|
| 964 | 964 | |
| 965 | 965 | } |
| 966 | 966 | |
@@ -972,10 +972,10 @@ discard block |
||
| 972 | 972 | * @global WP $wp |
| 973 | 973 | * @return string $current_page_url |
| 974 | 974 | */ |
| 975 | - function sensei_get_current_page_url(){ |
|
| 975 | + function sensei_get_current_page_url() { |
|
| 976 | 976 | |
| 977 | 977 | global $wp; |
| 978 | - $current_page_url = home_url( $wp->request ); |
|
| 978 | + $current_page_url = home_url($wp->request); |
|
| 979 | 979 | return $current_page_url; |
| 980 | 980 | |
| 981 | 981 | } |
@@ -986,9 +986,9 @@ discard block |
||
| 986 | 986 | * |
| 987 | 987 | * @since 1.9.0 |
| 988 | 988 | */ |
| 989 | -function sensei_the_my_courses_content(){ |
|
| 989 | +function sensei_the_my_courses_content() { |
|
| 990 | 990 | |
| 991 | - echo Sensei()->course->load_user_courses_content( wp_get_current_user() ); |
|
| 991 | + echo Sensei()->course->load_user_courses_content(wp_get_current_user()); |
|
| 992 | 992 | |
| 993 | 993 | } // sensei_the_my_courses_content |
| 994 | 994 | |
@@ -1001,9 +1001,9 @@ discard block |
||
| 1001 | 1001 | * |
| 1002 | 1002 | * @since 1.9.0 |
| 1003 | 1003 | */ |
| 1004 | -function sensei_load_template( $template_name ){ |
|
| 1004 | +function sensei_load_template($template_name) { |
|
| 1005 | 1005 | |
| 1006 | - Sensei_Templates::get_template( $template_name ); |
|
| 1006 | + Sensei_Templates::get_template($template_name); |
|
| 1007 | 1007 | |
| 1008 | 1008 | } |
| 1009 | 1009 | |
@@ -1015,9 +1015,9 @@ discard block |
||
| 1015 | 1015 | * @param string $name the name of the template. |
| 1016 | 1016 | * @since 1.9.0 |
| 1017 | 1017 | */ |
| 1018 | -function sensei_load_template_part( $slug, $name ){ |
|
| 1018 | +function sensei_load_template_part($slug, $name) { |
|
| 1019 | 1019 | |
| 1020 | - Sensei_Templates::get_part( $slug, $name ); |
|
| 1020 | + Sensei_Templates::get_part($slug, $name); |
|
| 1021 | 1021 | |
| 1022 | 1022 | } |
| 1023 | 1023 | |
@@ -1034,19 +1034,19 @@ discard block |
||
| 1034 | 1034 | * @access public |
| 1035 | 1035 | * @param string $lesson_id |
| 1036 | 1036 | */ |
| 1037 | -function sensei_the_lesson_excerpt( $lesson_id = '' ) { |
|
| 1037 | +function sensei_the_lesson_excerpt($lesson_id = '') { |
|
| 1038 | 1038 | |
| 1039 | - if( empty( $lesson_id )){ |
|
| 1039 | + if (empty($lesson_id)) { |
|
| 1040 | 1040 | |
| 1041 | 1041 | $lesson_id = get_the_ID(); |
| 1042 | 1042 | |
| 1043 | 1043 | } |
| 1044 | 1044 | |
| 1045 | - if( 'lesson' != get_post_type( $lesson_id ) ){ |
|
| 1045 | + if ('lesson' != get_post_type($lesson_id)) { |
|
| 1046 | 1046 | return; |
| 1047 | 1047 | } |
| 1048 | 1048 | |
| 1049 | - echo Sensei_Lesson::lesson_excerpt( get_post( $lesson_id ), false ); |
|
| 1049 | + echo Sensei_Lesson::lesson_excerpt(get_post($lesson_id), false); |
|
| 1050 | 1050 | |
| 1051 | 1051 | }// End lesson_excerpt() |
| 1052 | 1052 | |
@@ -1055,17 +1055,17 @@ discard block |
||
| 1055 | 1055 | * |
| 1056 | 1056 | * @since 1.9.0 |
| 1057 | 1057 | */ |
| 1058 | -function sensei_the_course_results_lessons(){ |
|
| 1058 | +function sensei_the_course_results_lessons() { |
|
| 1059 | 1059 | // load backwards compatible template name if it exists in the users theme |
| 1060 | - $located_template= locate_template( Sensei()->template_url . 'course-results/course-lessons.php' ); |
|
| 1061 | - if( $located_template ){ |
|
| 1060 | + $located_template = locate_template(Sensei()->template_url.'course-results/course-lessons.php'); |
|
| 1061 | + if ($located_template) { |
|
| 1062 | 1062 | |
| 1063 | - Sensei_Templates::get_template( 'course-results/course-lessons.php' ); |
|
| 1063 | + Sensei_Templates::get_template('course-results/course-lessons.php'); |
|
| 1064 | 1064 | return; |
| 1065 | 1065 | |
| 1066 | 1066 | } |
| 1067 | 1067 | |
| 1068 | - Sensei_Templates::get_template( 'course-results/lessons.php' ); |
|
| 1068 | + Sensei_Templates::get_template('course-results/lessons.php'); |
|
| 1069 | 1069 | } |
| 1070 | 1070 | |
| 1071 | 1071 | /** |
@@ -1075,7 +1075,7 @@ discard block |
||
| 1075 | 1075 | * @uses Sensei_Course::get_loop_number_of_columns |
| 1076 | 1076 | * @since 1.9.0 |
| 1077 | 1077 | */ |
| 1078 | -function sensei_courses_per_row(){ |
|
| 1078 | +function sensei_courses_per_row() { |
|
| 1079 | 1079 | |
| 1080 | 1080 | echo Sensei_Course::get_loop_number_of_columns(); |
| 1081 | 1081 | |
@@ -1089,8 +1089,8 @@ discard block |
||
| 1089 | 1089 | * @param $args |
| 1090 | 1090 | * @param $path |
| 1091 | 1091 | */ |
| 1092 | -function sensei_get_template( $template_name, $args, $path ){ |
|
| 1092 | +function sensei_get_template($template_name, $args, $path) { |
|
| 1093 | 1093 | |
| 1094 | - Sensei_Templates::get_template( $template_name, $args, $path ); |
|
| 1094 | + Sensei_Templates::get_template($template_name, $args, $path); |
|
| 1095 | 1095 | |
| 1096 | 1096 | } |
