+ // Only allow admins to load this page and run the update functions
+ if( current_user_can( 'administrator' ) ) {
+ ?>
+
-
-
+
+
- = 0 && ( ( isset( $_POST['checked'][0] ) && '' != $_POST['checked'][0] ) || ( isset( $_GET['functions'] ) && '' != $_GET['functions'] ) ) ) {
+ = 0 && ( ( isset( $_POST['checked'][0] ) && '' != $_POST['checked'][0] ) || ( isset( $_GET['functions'] ) && '' != $_GET['functions'] ) ) ) {
- // Setup the data variables
- $n = intval( $_GET['n'] );
- $functions_list = '';
- $done_processing = false;
+ // Setup the data variables
+ $n = intval( $_GET['n'] );
+ $functions_list = '';
+ $done_processing = false;
- // Check for updates to run
- if ( isset( $_POST['checked'][0] ) && '' != $_POST['checked'][0] ) {
+ // Check for updates to run
+ if ( isset( $_POST['checked'][0] ) && '' != $_POST['checked'][0] ) {
- foreach ( $_POST['checked'] as $key => $value ) {
+ foreach ( $_POST['checked'] as $key => $value ) {
- // Dynamic function call
- if ( method_exists( $this, $value) ) {
- $done_processing = call_user_func_array( array( $this, $value ), array( 5, $n ) );
- } else {
- $done_processing = call_user_func_array( $value, array( 5, $n ) );
- } // End If Statement
+ // Dynamic function call
+ if ( method_exists( $this, $value) ) {
+ $done_processing = call_user_func_array( array( $this, $value ), array( 5, $n ) );
+ } else {
+ $done_processing = call_user_func_array( $value, array( 5, $n ) );
+ } // End If Statement
- // Add to functions list get args
- if ( '' == $functions_list ) {
- $functions_list .= $value;
- } else {
- $functions_list .= '+' . $value;
- } // End If Statement
+ // Add to functions list get args
+ if ( '' == $functions_list ) {
+ $functions_list .= $value;
+ } else {
+ $functions_list .= '+' . $value;
+ } // End If Statement
- // Mark update has having been run
- $this->set_update_run( $value );
+ // Mark update has having been run
+ $this->set_update_run( $value );
- } // End For Loop
+ } // End For Loop
- } // End If Statement
+ } // End If Statement
- // Check for updates to run
- if ( isset( $_GET['functions'] ) && '' != $_GET['functions'] ) {
+ // Check for updates to run
+ if ( isset( $_GET['functions'] ) && '' != $_GET['functions'] ) {
- // Existing functions from GET variables instead of POST
- $functions_array = $_GET['functions'];
+ // Existing functions from GET variables instead of POST
+ $functions_array = $_GET['functions'];
- foreach ( $functions_array as $key => $value ) {
+ foreach ( $functions_array as $key => $value ) {
- // Dynamic function call
- if ( method_exists( $this, $value) ) {
- $done_processing = call_user_func_array( array( $this, $value ), array( 5, $n ) );
- } else {
- $done_processing = call_user_func_array( $value, array( 5, $n ) );
- } // End If Statement
+ // Dynamic function call
+ if ( method_exists( $this, $value) ) {
+ $done_processing = call_user_func_array( array( $this, $value ), array( 5, $n ) );
+ } else {
+ $done_processing = call_user_func_array( $value, array( 5, $n ) );
+ } // End If Statement
- // Add to functions list get args
- if ( '' == $functions_list ) {
- $functions_list .= $value;
- } else {
- $functions_list .= '+' . $value;
- } // End If Statement
+ // Add to functions list get args
+ if ( '' == $functions_list ) {
+ $functions_list .= $value;
+ } else {
+ $functions_list .= '+' . $value;
+ } // End If Statement
- } // End For Loop
+ } // End For Loop
- } // End If Statement
+ } // End If Statement
- if ( ! $done_processing ) { ?>
+ if ( ! $done_processing ) { ?>
-
+
-
-
+
+
+
+
or .
+
+
-
-
or .
-
-
-
-
-
', '' ); ?>
-
-
-
-
-
-
-
- |
- |
- |
-
-
-
-
-
- |
- |
- |
-
-
-
-
- updates, array( $this, 'sort_updates' ) );
- $this->updates = array_reverse( $this->updates, true );
- foreach( $this->updates as $version => $version_updates ) {
- foreach( $version_updates as $type => $updates ) {
- foreach( $updates as $update => $data ) {
- $update_run = $this->has_update_run( $update );
- $product = 'Sensei';
- if ( isset( $data['product'] ) && '' != $data['product'] ) {
- $product = $data['product'];
- } // End If Statement
- ?>
-
-
+ ', '' ); ?>
+
+
+
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+ updates, array( $this, 'sort_updates' ) );
+ $this->updates = array_reverse( $this->updates, true );
+ foreach( $this->updates as $version => $version_updates ) {
+ foreach( $version_updates as $type => $updates ) {
+ foreach( $updates as $update => $data ) {
+ $update_run = $this->has_update_run( $update );
+ $product = 'Sensei';
+ if ( isset( $data['product'] ) && '' != $data['product'] ) {
+ $product = $data['product'];
+ } // End If Statement
+ ?>
+
+
-
+ ?>
+
-
+
-
+
- updates as $version => $value ) {
- foreach ( $this->updates[$version] as $upgrade_type => $function_to_run ) {
- if ( $upgrade_type == $type ) {
- $updated = false;
- // Run the update function
- foreach ( $function_to_run as $function_name => $update_data ) {
- if ( isset( $function_name ) && '' != $function_name ) {
- if ( ! in_array( $function_name, $this->updates_run ) ) {
- $updated = false;
- if ( method_exists( $this, $function_name ) ) {
- $updated = call_user_func( array( $this, $function_name ) );
- } elseif( function_exists( $function_name ) ) {
- $updated = call_user_func( $function_name );
- } else {
- // Nothing to see here...
- } // End If Statement
- if ( $updated ) {
- array_push( $this->updates_run, $function_name );
- } // End If Statement
- }
- } // End If Statement
- } // End For Loop
- } // End If Statement
+
+ // Only allow admins to run update functions
+ if( current_user_can( 'administrator' ) ) {
+
+ // Run through all functions
+ foreach ( $this->updates as $version => $value ) {
+ foreach ( $this->updates[$version] as $upgrade_type => $function_to_run ) {
+ if ( $upgrade_type == $type ) {
+ $updated = false;
+ // Run the update function
+ foreach ( $function_to_run as $function_name => $update_data ) {
+ if ( isset( $function_name ) && '' != $function_name ) {
+ if ( ! in_array( $function_name, $this->updates_run ) ) {
+ $updated = false;
+ if ( method_exists( $this, $function_name ) ) {
+ $updated = call_user_func( array( $this, $function_name ) );
+ } elseif( function_exists( $function_name ) ) {
+ $updated = call_user_func( $function_name );
+ } else {
+ // Nothing to see here...
+ } // End If Statement
+ if ( $updated ) {
+ array_push( $this->updates_run, $function_name );
+ } // End If Statement
+ }
+ } // End If Statement
+ } // End For Loop
+ } // End If Statement
+ } // End For Loop
} // End For Loop
- } // End For Loop
- update_option( $this->token . '-upgrades', $this->updates_run );
- return true;
+
+ update_option( $this->token . '-upgrades', $this->updates_run );
+ return true;
+
+ }
+ return false;
} // End update()
/**
@@ -377,9 +387,18 @@ public function set_default_question_type() {
);
$questions = get_posts( $args );
+ $already_run = true;
foreach( $questions as $question ) {
- wp_set_post_terms( $question->ID, array( $question_type ), 'question-type' );
+ if( $already_run ) {
+ $terms = wp_get_post_terms( $question->ID, 'question-type' );
+ if( is_array( $terms ) && count( $terms ) > 0 ) {
+ break;
+ }
+ }
+ $already_run = false;
+ wp_set_post_terms( $question->ID, array( 'multiple-choice' ), 'question-type' );
}
+
return true;
} // End set_default_question_type
diff --git a/classes/class-woothemes-sensei-utils.php b/classes/class-woothemes-sensei-utils.php
index 345bfde9a3..42dcc84fe0 100755
--- a/classes/class-woothemes-sensei-utils.php
+++ b/classes/class-woothemes-sensei-utils.php
@@ -353,12 +353,28 @@ public function sensei_save_quiz_answers( $submitted = false, $user_id = 0 ) {
if( $submitted && intval( $user_id ) > 0 ) {
foreach( $submitted as $question_id => $answer ) {
+
+ // Get question type
+ $question_types = wp_get_post_terms( $question_id, 'question-type' );
+ foreach( $question_types as $type ) {
+ $question_type = $type->slug;
+ }
+
+ // Sanitise answer
+ switch( $question_type ) {
+ case 'essay-paste': $answer = nl2br( stripslashes( $answer ) ); break;
+ case 'multi-line': $answer = nl2br( stripslashes( $answer ) ); break;
+ case 'single-line': $answer = stripslashes( $answer ); break;
+ case 'gap-fill': $answer = stripslashes( $answer ); break;
+ default: $answer = maybe_serialize( $answer ); break;
+ }
+
$args = array(
'post_id' => $question_id,
'username' => $user->user_login,
'user_email' => $user->user_email,
'user_url' => $user->user_url,
- 'data' => base64_encode( maybe_serialize( $answer ) ),
+ 'data' => base64_encode( $answer ),
'type' => 'sensei_user_answer', /* FIELD SIZE 20 */
'parent' => 0,
'user_id' => $user_id,
@@ -656,7 +672,7 @@ public function sensei_add_answer_notes( $question_id = 0, $user_id = 0, $notes
$activity_logged = false;
if( intval( $question_id ) > 0 ) {
- $notes = base64_encode( $notes );
+ $notes = base64_encode( stripslashes( $notes ) );
$args = array(
'post_id' => $question_id,
'username' => $user->user_login,
@@ -953,7 +969,7 @@ public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id
} elseif ( isset( $lesson_complete ) && $lesson_complete ) {
- if ( isset( $quiz_grade ) && $quiz_grade && abs( $quiz_grade ) >= 0 ) {
+ if ( isset( $quiz_grade ) && ! is_bool( $quiz_grade ) && abs( $quiz_grade ) >= 0 ) {
if ( $quiz_grade >= abs( round( $quiz_passmark_float, 2 ) ) ) {
@@ -993,7 +1009,7 @@ public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id
}
} else {
- if ( isset( $quiz_grade ) && $quiz_grade && abs( $quiz_grade ) >= 0 ) {
+ if ( isset( $quiz_grade ) && ! is_bool( $quiz_grade ) && abs( $quiz_grade ) >= 0 ) {
if ( $quiz_grade >= abs( round( $quiz_passmark_float, 2 ) ) ) {
$status = 'passed';
@@ -1037,5 +1053,42 @@ public static function sensei_user_quiz_status_message( $lesson_id = 0, $user_id
return array( 'status' => $status, 'box_class' => $box_class, 'message' => $message, 'extra' => $extra );
}
+ /**
+ * Start course for user
+ * @since 1.4.8
+ * @param integer $user_id User ID
+ * @param integer $course_id Course ID
+ * @return void
+ */
+ public function user_start_course( $user_id = 0, $course_id = 0 ) {
+
+ if( $user_id && $course_id ) {
+
+ // Get user object
+ $user = get_userdata( $user_id );
+
+ // Add user to course
+ $args = array(
+ 'post_id' => $course_id,
+ 'username' => $user->user_login,
+ 'user_email' => $user->user_email,
+ 'user_url' => $user->user_url,
+ 'data' => __( 'Course started by the user', 'woothemes-sensei' ),
+ 'type' => 'sensei_course_start', /* FIELD SIZE 20 */
+ 'parent' => 0,
+ 'user_id' => $user_id
+ );
+ $activity_logged = WooThemes_Sensei_Utils::sensei_log_activity( $args );
+
+ // Allow further actions
+ if ( $activity_logged ) {
+ do_action( 'sensei_user_course_start', $user_id, $course_id );
+ return true;
+ }
+ }
+
+ return false;
+ }
+
} // End Class
?>
\ No newline at end of file
diff --git a/classes/class-woothemes-sensei.php b/classes/class-woothemes-sensei.php
index 2beee5e891..3134823777 100755
--- a/classes/class-woothemes-sensei.php
+++ b/classes/class-woothemes-sensei.php
@@ -138,6 +138,7 @@ public function __construct ( $file ) {
add_action( 'woocommerce_payment_complete' , array( $this, 'sensei_woocommerce_complete_order' ) );
add_action( 'woocommerce_thankyou' , array( $this, 'sensei_woocommerce_complete_order' ) );
add_action( 'woocommerce_order_status_completed' , array( $this, 'sensei_woocommerce_complete_order' ) );
+ add_action( 'woocommerce_order_status_processing' , array( $this, 'sensei_woocommerce_complete_order' ) );
add_action( 'woocommerce_order_status_cancelled' , array( $this, 'sensei_woocommerce_cancel_order' ) );
add_action( 'woocommerce_order_status_refunded' , array( $this, 'sensei_woocommerce_cancel_order' ) );
add_action( 'subscriptions_activated_for_order', array( $this, 'sensei_activate_subscription' ) );
diff --git a/templates/single-quiz/question_type-boolean.php b/templates/single-quiz/question_type-boolean.php
index 5ddc96c353..4bcc36ad5e 100644
--- a/templates/single-quiz/question_type-boolean.php
+++ b/templates/single-quiz/question_type-boolean.php
@@ -36,7 +36,7 @@
$answer_message = false;
$answer_notes = false;
-if( $lesson_complete && $user_quiz_grade && $user_quiz_grade != '' ) {
+if( $lesson_complete && $user_quiz_grade != '' ) {
$user_correct = false;
$answer_message = __( 'Incorrect', 'woothemes-sensei' );
$answer_message_class = 'user_wrong';
@@ -72,6 +72,10 @@
$answer_class = 'user_right';
}
$answer_class .= ' right_answer';
+ } else {
+ if( ! $user_correct ) {
+ $answer_class = 'user_wrong';
+ }
}
}
?>
@@ -84,6 +88,10 @@
$answer_class = 'user_right';
}
$answer_class .= ' right_answer';
+ } else {
+ if( ! $user_correct ) {
+ $answer_class = 'user_wrong';
+ }
}
}
?>
diff --git a/templates/single-quiz/question_type-essay-paste.php b/templates/single-quiz/question_type-essay-paste.php
index 641b72a07c..562b8255d7 100644
--- a/templates/single-quiz/question_type-essay-paste.php
+++ b/templates/single-quiz/question_type-essay-paste.php
@@ -35,7 +35,7 @@
$answer_message = false;
$answer_notes = false;
-if( $lesson_complete && $user_quiz_grade && $user_quiz_grade != '' ) {
+if( $lesson_complete && $user_quiz_grade != '' ) {
$user_correct = false;
$answer_message = __( 'Incorrect', 'woothemes-sensei' );
$answer_message_class = 'user_wrong';
diff --git a/templates/single-quiz/question_type-gap-fill.php b/templates/single-quiz/question_type-gap-fill.php
index a680ba9490..2260570079 100644
--- a/templates/single-quiz/question_type-gap-fill.php
+++ b/templates/single-quiz/question_type-gap-fill.php
@@ -36,7 +36,7 @@
$answer_message = false;
$answer_notes = false;
-if( $lesson_complete && $user_quiz_grade && $user_quiz_grade != '' ) {
+if( $lesson_complete && $user_quiz_grade != '' ) {
$user_correct = false;
$answer_message = __( 'Incorrect', 'woothemes-sensei' );
$answer_message_class = 'user_wrong';
diff --git a/templates/single-quiz/question_type-multi-line.php b/templates/single-quiz/question_type-multi-line.php
index bd756470b2..8d999c2073 100644
--- a/templates/single-quiz/question_type-multi-line.php
+++ b/templates/single-quiz/question_type-multi-line.php
@@ -35,7 +35,7 @@
$answer_message = false;
$answer_notes = false;
-if( $lesson_complete && $user_quiz_grade && $user_quiz_grade != '' ) {
+if( $lesson_complete && $user_quiz_grade != '' ) {
$user_correct = false;
$answer_message = __( 'Incorrect', 'woothemes-sensei' );
$answer_message_class = 'user_wrong';
diff --git a/templates/single-quiz/question_type-multiple-choice.php b/templates/single-quiz/question_type-multiple-choice.php
index 0a85868570..37d954af8c 100644
--- a/templates/single-quiz/question_type-multiple-choice.php
+++ b/templates/single-quiz/question_type-multiple-choice.php
@@ -35,7 +35,7 @@
$answer_message = false;
$answer_notes = false;
-if( $lesson_complete && $user_quiz_grade && $user_quiz_grade != '' ) {
+if( $lesson_complete && $user_quiz_grade != '' ) {
$user_correct = false;
$answer_message = __( 'Incorrect', 'woothemes-sensei' );
$answer_message_class = 'user_wrong';
diff --git a/templates/single-quiz/question_type-single-line.php b/templates/single-quiz/question_type-single-line.php
index 1e81598168..aa0727776a 100644
--- a/templates/single-quiz/question_type-single-line.php
+++ b/templates/single-quiz/question_type-single-line.php
@@ -35,7 +35,7 @@
$answer_message = false;
$answer_notes = false;
-if( $lesson_complete && $user_quiz_grade && $user_quiz_grade != '' ) {
+if( $lesson_complete && $user_quiz_grade != '' ) {
$user_correct = false;
$answer_message = __( 'Incorrect', 'woothemes-sensei' );
$answer_message_class = 'user_wrong';
diff --git a/widgets/widget-woothemes-sensei-course-component.php b/widgets/widget-woothemes-sensei-course-component.php
index f8c909fe1b..e98e1ebaee 100644
--- a/widgets/widget-woothemes-sensei-course-component.php
+++ b/widgets/widget-woothemes-sensei-course-component.php
@@ -202,10 +202,10 @@ protected function load_component ( $instance ) {
$posts_array = array();
- if ( !empty( $course_ids ) ) {
+ if ( ! empty( $course_ids ) ) {
$posts_array = $woothemes_sensei->post_types->course->course_query( intval( $instance['limit'] ), esc_attr( $instance['component'] ), $course_ids );
} else {
- if ( 'activecourses' == esc_attr( $instance['component'] ) ) {
+ if ( 'activecourses' == esc_attr( $instance['component'] ) || 'completedcourses' == esc_attr( $instance['component'] ) ) {
$posts_array = array();
} else {
$posts_array = $woothemes_sensei->post_types->course->course_query( intval( $instance['limit'] ), esc_attr( $instance['component'] ) );
diff --git a/woothemes-sensei.php b/woothemes-sensei.php
index 3285cca539..10d8af1068 100644
--- a/woothemes-sensei.php
+++ b/woothemes-sensei.php
@@ -3,7 +3,7 @@
Plugin Name: Sensei
Plugin URI: http://www.woothemes.com/products/sensei/
Description: Sensei by WooThemes is the best Learning Management System ever!
-Version: 1.4.7
+Version: 1.4.8
Author: WooThemes
Author URI: http://www.woothemes.com/
License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -31,7 +31,7 @@
if ( ! is_admin() ) require_once( 'inc/woothemes-sensei-template.php' );
global $woothemes_sensei;
$woothemes_sensei = new WooThemes_Sensei( __FILE__ );
- $woothemes_sensei->version = '1.4.7';
+ $woothemes_sensei->version = '1.4.8';
/**
* Plugin updates