From 3163d203c3d712cd19fb3f139dd5f9c156653259 Mon Sep 17 00:00:00 2001
From: Mohammad Zubair Ali <zubair@expresstech.io>
Date: Thu, 14 Dec 2023 13:04:34 +0530
Subject: [PATCH 1/5] merge with dev code

---
 js/qsm-admin.js                               |  7 ++--
 mlw_quizmaster2.php                           |  1 +
 php/admin/admin-results-page.php              |  2 +-
 php/classes/class-qmn-plugin-helper.php       |  1 +
 php/classes/class-qsm-install.php             | 12 +++++-
 php/question-types/qsm-question-title.php     |  4 +-
 .../qsm-question-type-dropdown.php            | 38 +++++++++++--------
 .../qsm-tempvar-question-answers.php          |  2 +
 readme.txt                                    |  3 +-
 9 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/js/qsm-admin.js b/js/qsm-admin.js
index d9e849475..e7b6bba3f 100644
--- a/js/qsm-admin.js
+++ b/js/qsm-admin.js
@@ -2097,7 +2097,7 @@ var import_button;
                     });
 					model.set('answers', answers);
 					model.set('required', required);
-
+                    jQuery(document).trigger('qsm_save_question_before', [questionID, CurrentElement, model, advanced_option]);
                     $('.questionElements .advanced-content > .qsm-row:not(.core-option)').each(function () {
                         if ($(this).find('input[type="text"]').length > 0) {
                             $($(this).find('input[type="text"]')).each(function () {
@@ -2428,6 +2428,7 @@ var import_button;
                                 $('#match-answer').val(value);
                             }
                         });
+                        jQuery(document).trigger('qsm_all_question_setting_after', [all_setting]);
                     }
                     CurrentElement.parents('.question').next('.questionElements').slideDown('slow');
                     $('#modal-1-content').html(questionElements);
@@ -2758,6 +2759,7 @@ var import_button;
                     QSMQuestion.saveQuestion($(this).parents('.questionElements').children('#edit_question_id').val(), $(this));
                     $('.save-page-button').trigger('click');
                     $('#modal-1-content').html(model_html);
+                    jQuery(document).trigger('qsm_save_popup_button_after', [questionElements]);
                 });
                 $(document).on('click', '#new-answer-button', function (event) {
                     event.preventDefault();
@@ -2996,10 +2998,9 @@ var import_button;
                     if ('image' === answerType) {
                         $('#image_size_area').show();
                     }
+                    jQuery(document).trigger('qsm_question_type_change_after', [question_val]);
                 });
 
-
-
                 //Add new category
                 $(document).on('click', '#qsm-category-add-toggle', function () {
                     if ($('#qsm-category-add').is(":visible")) {
diff --git a/mlw_quizmaster2.php b/mlw_quizmaster2.php
index 1d4e9d0d5..7309e7a1e 100644
--- a/mlw_quizmaster2.php
+++ b/mlw_quizmaster2.php
@@ -450,6 +450,7 @@ public function qsm_admin_scripts_style( $hook ) {
 			'add_more'                   => __("Add", 'quiz-master-next'),
 			'_X_validation_fails'        => __("Please enter an appropriate value for 'X'", 'quiz-master-next'),
 		);
+		$qsm_admin_messages = apply_filters( 'qsm_admin_messages_after', $qsm_admin_messages );
 		wp_localize_script( 'qsm_admin_js', 'qsm_admin_messages', $qsm_admin_messages );
 
 	}
diff --git a/php/admin/admin-results-page.php b/php/admin/admin-results-page.php
index 6feda6700..26ce2278e 100644
--- a/php/admin/admin-results-page.php
+++ b/php/admin/admin-results-page.php
@@ -570,7 +570,7 @@ function qsm_results_overview_tab_content() {
 						</label>
 						<label>
 							<input type="checkbox" value="1" name="view_result_page" <?php checked( $results_screen_option['view_result_page'], "1", true ) ?>/>
-							<?php esc_html_e( 'Page Result', 'quiz-master-next' ); ?>
+							<?php esc_html_e( 'Result Page', 'quiz-master-next' ); ?>
 						</label>
 						<label>
 							<input type="checkbox" name="page_name" value="1" <?php checked( $results_screen_option['page_name'], "1", true ) ?>/>
diff --git a/php/classes/class-qmn-plugin-helper.php b/php/classes/class-qmn-plugin-helper.php
index 768e99373..cf673ac76 100644
--- a/php/classes/class-qmn-plugin-helper.php
+++ b/php/classes/class-qmn-plugin-helper.php
@@ -554,6 +554,7 @@ public static function get_default_texts() {
 			'retake_quiz_button_text'          => __('Retake Quiz', 'quiz-master-next'),
 			'previous_button_text'             => __('Previous', 'quiz-master-next'),
 			'next_button_text'                 => __('Next', 'quiz-master-next'),
+			'deselect_answer_text'             => __('Deselect Answer', 'quiz-master-next'),
 			'empty_error_text'                 => __('Please complete all required fields!', 'quiz-master-next'),
 			'email_error_text'                 => __('Not a valid e-mail address!', 'quiz-master-next'),
 			'number_error_text'                => __('This field must be a number!', 'quiz-master-next'),
diff --git a/php/classes/class-qsm-install.php b/php/classes/class-qsm-install.php
index b75ac0142..7fc2c3ddb 100644
--- a/php/classes/class-qsm-install.php
+++ b/php/classes/class-qsm-install.php
@@ -1312,7 +1312,7 @@ public function register_default_settings() {
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_text' );
 
-		// Registers start_quiz_survey_text setting
+		// Registers No answer provided setting
 		$field_array = array(
 			'id'         => 'no_answer_text',
 			'label'      => __( 'No Answer Text', 'quiz-master-next' ),
@@ -1322,6 +1322,16 @@ public function register_default_settings() {
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_text' );
 
+		// Registers Deselect Answer setting
+		$field_array = array(
+			'id'         => 'deselect_answer_text',
+			'label'      => __( 'Deselect Answer Text', 'quiz-master-next' ),
+			'type'       => 'text',
+			'default'    => __( 'Deselect Answer', 'quiz-master-next' ),
+			'option_tab' => 'text-button',
+		);
+		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_text' );
+
 		// Registers empty_error_text setting
 		$field_array = array(
 			'id'         => 'empty_error_text',
diff --git a/php/question-types/qsm-question-title.php b/php/question-types/qsm-question-title.php
index 78d4f0e3d..b3d2751e6 100644
--- a/php/question-types/qsm-question-title.php
+++ b/php/question-types/qsm-question-title.php
@@ -18,7 +18,9 @@ function qsm_question_title_func( $question, $question_type = '', $new_question_
 	$qmn_quiz_options = $mlwQuizMasterNext->quiz_settings->get_quiz_options();
 	$deselect_answer  = '';
 	if ( isset( $qmn_quiz_options->enable_deselect_option ) && 1 == $qmn_quiz_options->enable_deselect_option && ( 'multiple_choice' === $question_type || 'horizontal_multiple_choice' === $question_type ) ) {
-		$deselect_answer = '<a href="javascript:void(0)" class="qsm-deselect-answer">'.__( 'Deselect Answer', 'quiz-master-next' ).'</a>';
+		$default_texts = QMNPluginHelper::get_default_texts();
+		$deselect_answer_text = ! empty( $qmn_quiz_options->deselect_answer_text ) ? $qmn_quiz_options->deselect_answer_text : $default_texts['deselect_answer_text'];
+		$deselect_answer = '<a href="javascript:void(0)" class="qsm-deselect-answer">'. $mlwQuizMasterNext->pluginHelper->qsm_language_support( $deselect_answer_text, "deselect_answer_text-{$qmn_quiz_options->quiz_id}" ) .'</a>';
 	}
 	do_action('qsm_question_title_func_before',$question, $question_type, $new_question_title, $question_id );
 	if ( '' !== $new_question_title ) {
diff --git a/php/question-types/qsm-question-type-dropdown.php b/php/question-types/qsm-question-type-dropdown.php
index 09779fee9..603381bfb 100644
--- a/php/question-types/qsm-question-type-dropdown.php
+++ b/php/question-types/qsm-question-type-dropdown.php
@@ -21,27 +21,32 @@ function qmn_drop_down_display( $id, $question, $answers ) {
 		$require_class = '';
 	}
 	$new_question_title = $mlwQuizMasterNext->pluginHelper->get_question_setting( $id, 'question_title' );
+	$question = apply_filters( 'qsm_question_title_func_before', $question, $answers, $id );
 	qsm_question_title_func( $question, '', $new_question_title, $id );
+	$show = true;
+	$show = apply_filters( 'qsm_check_show_answer_drop_down', $show, $id, $question, $answers );
+	if ( $show ) {
 	?>
-	<select class="qsm_select qsm_dropdown <?php echo esc_attr( $require_class ); ?>" name="question<?php echo esc_attr( $id ); ?>">
-	<option disabled selected value><?php echo esc_html__( 'Please select your answer', 'quiz-master-next' ); ?></option>
-		<?php
-		if ( is_array( $answers ) ) {
-			$mlw_answer_total = 0;
-			foreach ( $answers as $answer_index => $answer ) {
-				$mlw_answer_total++;
-				if ( '' !== $answer[0] ) {
-					$answer_text = trim( htmlspecialchars_decode( $answer[0], ENT_QUOTES ) );
-					$answer_text = $mlwQuizMasterNext->pluginHelper->qsm_language_support( $answer_text, "answer-" . $id . "-" . $answer_index, "QSM Answers" );
-					?>
-					<option value="<?php echo esc_attr( $answer_index ); ?>"><?php echo esc_html( $answer_text ); ?></option>
-					<?php
+		<select class="qsm_select qsm_dropdown <?php echo esc_attr( $require_class ); ?>" name="question<?php echo esc_attr( $id ); ?>">
+		<option disabled selected value><?php echo esc_html__( 'Please select your answer', 'quiz-master-next' ); ?></option>
+			<?php
+			if ( is_array( $answers ) ) {
+				$mlw_answer_total = 0;
+				foreach ( $answers as $answer_index => $answer ) {
+					$mlw_answer_total++;
+					if ( '' !== $answer[0] ) {
+						$answer_text = trim( htmlspecialchars_decode( $answer[0], ENT_QUOTES ) );
+						$answer_text = $mlwQuizMasterNext->pluginHelper->qsm_language_support( $answer_text, "answer-" . $id . "-" . $answer_index, "QSM Answers" );
+						?>
+						<option value="<?php echo esc_attr( $answer_index ); ?>"><?php echo esc_html( $answer_text ); ?></option>
+						<?php
+					}
 				}
 			}
-		}
-		?>
- 	</select>
+			?>
+		</select>
 	<?php
+	}
 	echo apply_filters( 'qmn_drop_down_display_front', '', $id, $question, $answers );
 }
 
@@ -56,6 +61,7 @@ function qmn_drop_down_display( $id, $question, $answers ) {
  */
 function qmn_drop_down_review( $id, $question, $answers ) {
 	$current_question               = new QSM_Question_Review_Choice( $id, $question, $answers );
+	$current_question               = apply_filters( 'qmn_drop_down_review_before', $current_question, $id, $question, $answers );
 	$user_text_array                = $current_question->get_user_answer();
 	$correct_text_array             = $current_question->get_correct_answer();
 	$return_array['user_text']      = ! empty( $user_text_array ) ? implode( ', ', $user_text_array ) : '' ;
diff --git a/php/template-variables/qsm-tempvar-question-answers.php b/php/template-variables/qsm-tempvar-question-answers.php
index c8050557f..2cf3b3154 100644
--- a/php/template-variables/qsm-tempvar-question-answers.php
+++ b/php/template-variables/qsm-tempvar-question-answers.php
@@ -14,6 +14,7 @@ function qsm_tempvar_qa_text_qt_choice( $total_answers, $answers_from_response,
 		if ( 1 === intval( $single_answer[2] ) ) {
 			$is_answer_correct = true;
 		}
+		$is_answer_correct = apply_filters( 'qsm_is_answer_correct_choice_before', $is_answer_correct, $single_answer, $user_answer_array, $single_answer_key, $answers_from_response, $grading_system, $question_settings, $form_type );
 		if ( in_array( $single_answer_key, $user_answer_keys, true ) ) {
 			$is_user_answer = true;
 		}
@@ -34,6 +35,7 @@ function qsm_tempvar_qa_text_qt_choice( $total_answers, $answers_from_response,
 			$image_class      = 'qmn_image_option';
 		} else {
 			$show_user_answer = $mlwQuizMasterNext->pluginHelper->qsm_language_support( htmlspecialchars_decode( $single_answer[0], ENT_QUOTES ), 'answer-' . $single_answer[0], 'QSM Answers' );
+			$show_user_answer = apply_filters( 'qsm_show_user_answer_before', $show_user_answer, $single_answer, $user_answer_array, $single_answer_key, $answers_from_response, $grading_system, $question_settings, $form_type );
 			$image_class      = '';
 		}
 		$close_span = '</span>';
diff --git a/readme.txt b/readme.txt
index c6c85a51e..c596a945c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -163,7 +163,8 @@ This is usually a theme conflict. You can [checkout out our common conflict solu
 18. Database
 
 == Changelog ==
-= 8.2.0 (December 04, 2023) =
+= 8.2.0 (December 14, 2023) =
+* Feature: Added option to change deletect answer text
 * Feature: Added option to duplicate quiz theme settings
 * Bug: Fixed issue related to limiting random questions by category
 * Bug: Fixed issue with images and video tags in the correct answer info

From 173e97f02124e8d307dfa29c24ebc55e8c113ce1 Mon Sep 17 00:00:00 2001
From: Mohammad Zubair Ali <zubair@expresstech.io>
Date: Thu, 14 Dec 2023 13:26:36 +0530
Subject: [PATCH 2/5] fixed timer issue

---
 js/qsm-quiz.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/qsm-quiz.js b/js/qsm-quiz.js
index d48ba92ea..210b96dfd 100644
--- a/js/qsm-quiz.js
+++ b/js/qsm-quiz.js
@@ -867,9 +867,7 @@ function qmnFormSubmit(quiz_form_id) {
 	fd.append("currentuserTimeZone", Intl.DateTimeFormat().resolvedOptions().timeZone);
 
 	qsmEndTimeTakenTimer(quiz_id);
-	if (qmn_quiz_data[quiz_id].hasOwnProperty('advanced_timer') && qmn_quiz_data[quiz_id].advanced_timer.hasOwnProperty('show_stop_timer') ) {
-		QSMPageTimer.endPageTimer(quiz_id);
-	}
+
 	if (qmn_quiz_data[quiz_id].hasOwnProperty('timer_limit')) {
 		QSM.endTimer(quiz_id);
 	}

From c0f9df49cc55727dc8e2813bae1ed39a18bc54de Mon Sep 17 00:00:00 2001
From: Mohammad Zubair Ali <zubair@expresstech.io>
Date: Thu, 14 Dec 2023 14:36:05 +0530
Subject: [PATCH 3/5] update changelog 8.2.0

---
 readme.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index c596a945c..47488decb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -164,12 +164,12 @@ This is usually a theme conflict. You can [checkout out our common conflict solu
 
 == Changelog ==
 = 8.2.0 (December 14, 2023) =
-* Feature: Added option to change deletect answer text
+* Feature: Added option to change deselect answer text
 * Feature: Added option to duplicate quiz theme settings
 * Bug: Fixed issue related to limiting random questions by category
 * Bug: Fixed issue with images and video tags in the correct answer info
 * Enhacements: Improved login form validations
-* Enhacements: Reduce number of cookies
+* Enhacements: Improved performance by optimizing cookies
 
 = 8.1.19 (November 08, 2023) =
 * Feature: Added an option to display result URLs on the admin result page

From 3e52ae31bdbfbf032313544b7136e1bf11587899 Mon Sep 17 00:00:00 2001
From: etchirag <chirag@expresstech.io>
Date: Fri, 15 Dec 2023 06:19:45 +0530
Subject: [PATCH 4/5] Fixed advance timer save setting option for new users

---
 php/admin/options-page-questions-tab.php | 17 +++++++++++++----
 php/admin/quiz-options-page.php          | 17 +++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/php/admin/options-page-questions-tab.php b/php/admin/options-page-questions-tab.php
index 368812e8d..2c84953b0 100644
--- a/php/admin/options-page-questions-tab.php
+++ b/php/admin/options-page-questions-tab.php
@@ -173,13 +173,22 @@ function qsm_options_questions_tab_content() {
 			$target_link = sprintf( '<div class="notice notice-error notice-advance-timer"><strong>'.__('Error! ', 'quiz-master-next').'</strong>'.$target_text.'<a style="font-weight: bolder;" href="%s" target="_blank">%s</a></div>', esc_url( $item_url ), __( 'Click here to renew', 'quiz-master-next' ) );
 			echo wp_kses_post($target_link);
 		}
-		if ( isset($settings_data['last_validate']) && "invalid" == $settings_data['last_validate'] ) {
+		if ( ( isset($settings_data['last_validate']) && "invalid" == $settings_data['last_validate'] ) || empty($settings_data) ) {
 			$read_only = 'readonly';
 			$disable_class = 'qsm-disabled-td';
 			$background = "#F0F0F0";
-			$target_text = __(' Your Advanced Timer Settings are not saved successfully. Validate license to save the settings. ', 'quiz-master-next');
-			$target_link = sprintf( '<div class="notice notice-error notice-advance-timer"><strong>'.__('Error! ', 'quiz-master-next').'</strong>'.$target_text.'</div>' );
-			echo wp_kses_post($target_link);
+			$admin_page_url = esc_url(admin_url('admin.php?page=qmn_addons&tab=advanced-timer'));
+			$error_message = sprintf(
+				'<div class="notice notice-error notice-advance-timer">
+					<strong>%s</strong> %s <a href="%s" target="_blank">%s</a> %s
+				</div>',
+				__('Error! ', 'quiz-master-next'),
+				__('Your Advanced Timer Settings are not saved successfully. ', 'quiz-master-next'),
+				$admin_page_url,
+				__('Validate license', 'quiz-master-next'),
+				__('to save the settings. ', 'quiz-master-next')
+			);
+			echo wp_kses_post($error_message);
 		}
 		$advancetimer = 'qsm-advanced-timer/qsm-advanced-timer.php';
 		$plugin_data = get_plugin_data(WP_PLUGIN_DIR . '/'. $advancetimer);
diff --git a/php/admin/quiz-options-page.php b/php/admin/quiz-options-page.php
index 491018de3..f0fe61986 100644
--- a/php/admin/quiz-options-page.php
+++ b/php/admin/quiz-options-page.php
@@ -103,6 +103,23 @@ function qsm_generate_quiz_options() {
 
 	$qsm_core_tabs = array( 'questions', 'contact', 'text', 'options', 'emails', 'results-pages', 'style' );
 	$addon_tabs    = '';
+	if ( class_exists ( 'QSM_AdvancedTimer' ) ) {
+		$settings_data   = get_option('qsm_addon_advanced_timer_settings', '');
+		if ( ( isset($settings_data['last_validate']) && "invalid" == $settings_data['last_validate'] ) || empty($settings_data) ) {
+			$admin_page_url = esc_url(admin_url('admin.php?page=qmn_addons&tab=advanced-timer'));
+			$error_message = sprintf(
+				'<div class="notice notice-error notice-advance-timer">
+					<strong>%s</strong> %s <a href="%s" target="_blank">%s</a> %s
+				</div>',
+				__('Error! ', 'quiz-master-next'),
+				__('Your Advanced Timer Settings are not saved successfully. ', 'quiz-master-next'),
+				$admin_page_url,
+				__('Validate license', 'quiz-master-next'),
+				__('to save the settings. ', 'quiz-master-next')
+			);
+			echo wp_kses_post($error_message);
+		}
+	}
 	?>
 	<div class="wrap" id="mlw_quiz_wrap">
 		<div class='mlw_quiz_options' id="mlw_quiz_options">

From 6848341080688c4db09fe314650b709e14f42a6b Mon Sep 17 00:00:00 2001
From: etchirag <chirag@expresstech.io>
Date: Fri, 15 Dec 2023 06:51:51 +0530
Subject: [PATCH 5/5] message removed from option tab, auto pagination option
 hide from advance timer if license is not there

---
 php/admin/quiz-options-page.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/php/admin/quiz-options-page.php b/php/admin/quiz-options-page.php
index f0fe61986..491018de3 100644
--- a/php/admin/quiz-options-page.php
+++ b/php/admin/quiz-options-page.php
@@ -103,23 +103,6 @@ function qsm_generate_quiz_options() {
 
 	$qsm_core_tabs = array( 'questions', 'contact', 'text', 'options', 'emails', 'results-pages', 'style' );
 	$addon_tabs    = '';
-	if ( class_exists ( 'QSM_AdvancedTimer' ) ) {
-		$settings_data   = get_option('qsm_addon_advanced_timer_settings', '');
-		if ( ( isset($settings_data['last_validate']) && "invalid" == $settings_data['last_validate'] ) || empty($settings_data) ) {
-			$admin_page_url = esc_url(admin_url('admin.php?page=qmn_addons&tab=advanced-timer'));
-			$error_message = sprintf(
-				'<div class="notice notice-error notice-advance-timer">
-					<strong>%s</strong> %s <a href="%s" target="_blank">%s</a> %s
-				</div>',
-				__('Error! ', 'quiz-master-next'),
-				__('Your Advanced Timer Settings are not saved successfully. ', 'quiz-master-next'),
-				$admin_page_url,
-				__('Validate license', 'quiz-master-next'),
-				__('to save the settings. ', 'quiz-master-next')
-			);
-			echo wp_kses_post($error_message);
-		}
-	}
 	?>
 	<div class="wrap" id="mlw_quiz_wrap">
 		<div class='mlw_quiz_options' id="mlw_quiz_options">