From a8a0b62018556567cdabb80aed8f7fa353c16980 Mon Sep 17 00:00:00 2001
From: Mohammad Zubair Ali <zubair@expresstech.io>
Date: Tue, 26 Mar 2024 16:29:52 +0530
Subject: [PATCH 1/2] update apply global setting ui

---
 css/qsm-admin.css           |   8 +++
 js/qsm-admin.js             |   7 +--
 mlw_quizmaster2.php         |   1 +
 php/admin/settings-page.php | 113 ++++++++++++++++++------------------
 readme.txt                  |  22 ++++++-
 5 files changed, 84 insertions(+), 67 deletions(-)

diff --git a/css/qsm-admin.css b/css/qsm-admin.css
index a95f69887..2a02d9df4 100644
--- a/css/qsm-admin.css
+++ b/css/qsm-admin.css
@@ -773,6 +773,14 @@ ul.changelog li.update div.two:before {
 #qsm-export-settings-options .select2-container{
 	max-width: 430px;
 }
+.qsm-btn-link-global-settings {
+    line-height: 27px;
+    margin-right: 10px;
+}
+#qsm-export-settings-options .ms-options-wrap>.ms-options>.ms-search input{
+	max-width: 100% !important;
+    border: 1px solid #dcdccfd4;
+}
 .admin_page_mlw_quiz_options .qsm-info-widget {
 	background: #fff;
 	margin: 0 0 20px 0;
diff --git a/js/qsm-admin.js b/js/qsm-admin.js
index fe94e6156..29a895459 100644
--- a/js/qsm-admin.js
+++ b/js/qsm-admin.js
@@ -86,14 +86,8 @@ var QSMAdmin;
             MicroModal.show('qsm-global-default-popup');
         });
         $(document).on('click', '#qsm-apply-global-settings', function () {
-            console.log($('#qsm-select-quiz-apply').multiselect('getChecked'));
-            let selectedCount = $('#qsm-select-quiz-apply').find('option:selected').length;
-            jQuery("#qsm-quizzes-global-count").text(selectedCount);
             MicroModal.show('qsm-global-apply-default-popup');
         });
-        $(document).on('click', '#qsm-apply-global-default-btn', function () {
-            jQuery('#qsm-apply-global-settings-form').submit();
-        });
 
         $('#qmn_check_all').change(function () {
             $('.qmn_delete_checkbox').prop('checked', jQuery('#qmn_check_all').prop('checked'));
@@ -184,6 +178,7 @@ var QSMAdmin;
         if( jQuery('#qsm-select-quiz-apply').length ) {
             $('#qsm-select-quiz-apply').multiselect({
                 columns: 1,
+                placeholder: qsm_admin_messages.select,
                 search: true,
                 selectAll: true,
                 dropdownAutoWidth: false,
diff --git a/mlw_quizmaster2.php b/mlw_quizmaster2.php
index fa723ad31..15c9966e6 100644
--- a/mlw_quizmaster2.php
+++ b/mlw_quizmaster2.php
@@ -478,6 +478,7 @@ public function qsm_admin_scripts_style( $hook ) {
 			'variables'                  => __("Variables", 'quiz-master-next'),
 			'insert_variable'            => __("Insert QSM variables", 'quiz-master-next'),
 			'select_all'                 => __("Select All", 'quiz-master-next'),
+			'select'                     => __("Select", '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/settings-page.php b/php/admin/settings-page.php
index a7399c249..2f3229b56 100644
--- a/php/admin/settings-page.php
+++ b/php/admin/settings-page.php
@@ -87,8 +87,8 @@ public function init() {
 		add_settings_field( 'items-per-page-question-bank', __( 'Items per page in question bank pagination', 'quiz-master-next' ), array( $this, 'items_per_page_question_bank' ), 'qmn_global_settings', 'qmn-global-section' );
 		add_settings_field( 'new-template-result-detail', __( 'New Template For Admin Results Details', 'quiz-master-next' ), array( $this, 'new_template_results_details' ), 'qmn_global_settings', 'qmn-global-section' );
 		add_settings_field( 'results-details', __( 'Template For Admin Results Details', 'quiz-master-next' ), array( $this, 'results_details_template' ), 'qmn_global_settings', 'qmn-global-section' );
+		add_settings_field( 'api-key-options', __( 'Enable APIs', 'quiz-master-next' ), array( $this, 'api_key_options' ), 'qmn_global_settings', 'qmn-global-section' );
 		add_settings_field( 'api-key', __( 'API Key', 'quiz-master-next' ), array( $this, 'api_key_field' ), 'qmn_global_settings', 'qmn-global-section' );
-		add_settings_field( 'api-key-options', __( 'API Key Options', 'quiz-master-next' ), array( $this, 'api_key_options' ), 'qmn_global_settings', 'qmn-global-section' );
 	}
 
 	/**
@@ -107,15 +107,15 @@ public function api_key_options() {
 		<fieldset>
 			<label for="qmn-settings-get_questions">
 				<input type="checkbox" name="qmn-settings[get_questions]" id="qmn-settings-get_questions" value="1" <?php checked( $get_questions, 1, true ); ?> />
-				<?php esc_html_e( 'Enable get questions', 'quiz-master-next'); ?>
+				<?php esc_html_e( 'Get Questions', 'quiz-master-next'); ?>
 			</label><br/>
 			<label for="qmn-settings-get_quiz">
 				<input type="checkbox" name="qmn-settings[get_quiz]" id="qmn-settings-get_quiz" value="1" <?php checked( $get_quiz, 1, true ); ?> />
-				<?php esc_html_e( 'Enable get quiz', 'quiz-master-next'); ?>
+				<?php esc_html_e( 'Get Quiz', 'quiz-master-next'); ?>
 			</label><br/>
 			<label for="qmn-settings-allow_submit_quiz">
 				<input type="checkbox" name="qmn-settings[allow_submit_quiz]" id="qmn-settings-allow_submit_quiz" value="1" <?php checked( $allow_submit_quiz, 1, true ); ?> />
-				<?php esc_html_e( 'Allow Submit Quiz', 'quiz-master-next'); ?>
+				<?php esc_html_e( 'Submit Quiz', 'quiz-master-next'); ?>
 			</label><br/>
 			<label for="qmn-settings-get_result">
 				<input type="checkbox" name="qmn-settings[get_result]" id="qmn-settings-get_result" value="1" <?php checked( $get_result, 1, true ); ?> />
@@ -125,11 +125,11 @@ public function api_key_options() {
 		<?php
 	}
 
-	
+
 	public function api_key_field() {
 		$settings   = (array) get_option( 'qmn-settings' );
 		$api_key = ! empty( $settings['api_key'] ) ? esc_attr( $settings['api_key'] ) : '';
-		
+
 		$qpi_script_inline = array(
 			'confirmation_message' => __('Are you sure you want to regenerate the API Key? This will affect your settings when you save changes, and the old key will no longer work.', 'quiz-master-next'),
 			'nonce'                => wp_create_nonce('regenerate_api_key_nonce'),
@@ -607,7 +607,6 @@ public static function display_page() {
 				<!-- when tab buttons are clicked we jump back to the same page but with a new parameter that represents the clicked tab. accordingly we make it active -->
 				<a href="?page=qmn_global_settings&tab=qmn_global_settings" class="nav-tab <?php echo empty( $_GET['tab'] ) || 'qmn_global_settings' === $_GET['tab'] ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Main Settings', 'quiz-master-next' ); ?></a>
 				<a href="?page=qmn_global_settings&tab=quiz-default-options" class="nav-tab <?php echo ! empty( $_GET['tab'] ) && 'quiz-default-options' === $_GET['tab'] ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Quiz Default Options', 'quiz-master-next' ); ?></a>
-				<a href="?page=qmn_global_settings&tab=quiz-apply-default-options" class="nav-tab <?php echo ! empty( $_GET['tab'] ) && 'quiz-apply-default-options' === $_GET['tab'] ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Apply Default Options', 'quiz-master-next' ); ?></a>
 			</h2>
 
 			<?php if ( empty( $_GET['tab'] ) || 'qmn_global_settings' === $_GET['tab'] || 'quiz-default-options' === $_GET['tab'] ) { ?>
@@ -660,15 +659,15 @@ public static function display_page() {
 						<?php
 					}
 					?>
-					<p class="submit">
-						<a class="button-secondary" id="qsm-apply-global-settings" href="?page=qmn_global_settings&tab=quiz-apply-default-options"><?php esc_html_e( 'Apply to Quizzes', 'quiz-master-next'); ?></a>
-						<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_html_e( 'Save Changes', 'quiz-master-next'); ?>">
-					</p>
+					<div class="option-page-option-tab-footer">
+						<p></p>
+						<div>
+							<a class="qsm-btn-link-global-settings" id="qsm-apply-global-settings" href="javascript:void(0);"><?php esc_html_e( 'Apply to multiple quizzes', 'quiz-master-next'); ?></a>
+							<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_html_e( 'Save Changes', 'quiz-master-next'); ?>">
+						</div>
+					</div>
 				</form>
-			<?php } ?>
-
-			<?php if ( ! empty( $_GET['tab'] ) && 'quiz-apply-default-options' === $_GET['tab'] ) { ?>
-				<?php
+			<?php }
 				if ( isset( $_POST['qsm-apply-global-settings-nonce'] ) && wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['qsm-apply-global-settings-nonce'] ) ), 'qsm-apply-global-settings-nonce' ) && ! empty( $_POST['qsm-select-quiz'] ) ) {
 					global $mlwQuizMasterNext;
 					$quizzes = qsm_sanitize_rec_array( wp_unslash( $_POST['qsm-select-quiz'] ), true ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
@@ -684,54 +683,52 @@ public static function display_page() {
 					echo '</div>';
 				}
 				?>
-				<h2><?php esc_html_e( 'Apply global setting on quizzes', 'quiz-master-next' ); ?></h2>
-				<form action="" method="POST" id="qsm-apply-global-settings-form">
-					<?php wp_nonce_field( 'qsm-apply-global-settings-nonce', 'qsm-apply-global-settings-nonce' ); ?>
-					<?php
-					$args    = array(
-						'post_type'      => 'qsm_quiz',
-						'posts_per_page' => -1,
-						'post_status'    => 'publish',
-					);
-					$quizzes = get_posts( $args );
-					?>
-					<div class="qsm-field-row">
-						<label class="qsm-label"><?php esc_html_e( 'Select Quizzes', 'quiz-master-next' ); ?></label>
-						<div id="qsm-export-settings-options">
-							<select name="qsm-select-quiz[]" multiple="multiple" id="qsm-select-quiz-apply" required>
-								<?php if ( $quizzes ) : ?>
-									<?php foreach ( $quizzes as $quiz ) : ?>
-										<?php $quiz_id = get_post_meta( $quiz->ID, 'quiz_id', true ); ?>
-										<option value="<?php echo esc_attr( $quiz_id ); ?>" id="<?php echo esc_attr( $quiz_id ); ?>"><?php echo esc_html( $quiz->post_title ); ?></option>
-									<?php endforeach; ?>
-								<?php endif; ?>
-							</select>
-						</div>
-					</div>
-					<p class="submit">
-						<a href="javascript:void(0);" class="button button-primary" id="qsm-apply-global-settings"><?php esc_html_e( 'Apply settings', 'quiz-master-next' ); ?></a>
-					</p>
-				</form>
-			<?php } ?>
 		</div>
 		<!-- set global setting popup start -->
 		<div class="qsm-popup qsm-popup-slide qsm-standard-popup" id="qsm-global-apply-default-popup" aria-hidden="true">
 			<div class="qsm-popup__overlay" tabindex="-1" data-micromodal-close>
 				<div class="qsm-popup__container" role="dialog" aria-modal="true" aria-labelledby="modal-1-title">
-					<header class="qsm-popup__header">
-						<h2 class="qsm-popup__title" id="modal-1-title"><?php esc_html_e( 'Are you sure?', 'quiz-master-next' ); ?></h2>
-						<a class="qsm-popup__close" aria-label="Close modal" data-micromodal-close></a>
-					</header>
-					<main class="qsm-popup__content" id="qsm-global-default-popup-content">
-						<p>
-							<span id="qsm-quizzes-global-count">0</span>
-							<?php esc_html_e( 'Quizzes will be affected, Do you want to continue and reset all the settings? Please note that this action is not reversible.', 'quiz-master-next' ); ?>
-						</p>
-					</main>
-					<footer class="qsm-popup__footer">
-						<button class="qsm-popup__btn" data-micromodal-close="" aria-label="<?php esc_html_e( 'Close this dialog window', 'quiz-master-next' ); ?>"><?php esc_html_e( 'Cancel', 'quiz-master-next' ); ?></button>
-						<button class="button button-primary" type="button" id="qsm-apply-global-default-btn"><?php esc_html_e( 'Apply', 'quiz-master-next' ); ?></button>
-					</footer>
+					<form action="" method="POST" id="qsm-apply-global-settings-form">
+						<header class="qsm-popup__header">
+							<h2 class="qsm-popup__title" id="modal-1-title"><?php esc_html_e( 'Apply default settings to form', 'quiz-master-next' ); ?></h2>
+							<a class="qsm-popup__close" aria-label="Close modal" data-micromodal-close></a>
+						</header>
+						<main class="qsm-popup__content" id="qsm-global-default-popup-content">
+							<?php wp_nonce_field( 'qsm-apply-global-settings-nonce', 'qsm-apply-global-settings-nonce' ); ?>
+							<?php
+							$args    = array(
+								'post_type'      => 'qsm_quiz',
+								'posts_per_page' => -1,
+								'post_status'    => 'publish',
+							);
+							$quizzes = get_posts( $args );
+							?>
+							<div class="qsm-field-row">
+								<label class="qsm-label"><strong><?php esc_html_e( 'Apply the default settings to selected form type', 'quiz-master-next' ); ?></strong></label>
+								<div id="qsm-export-settings-options">
+									<select name="qsm-select-quiz[]" multiple="multiple" id="qsm-select-quiz-apply" required>
+										<?php if ( $quizzes ) : ?>
+											<?php foreach ( $quizzes as $quiz ) : ?>
+												<?php $quiz_id = get_post_meta( $quiz->ID, 'quiz_id', true ); ?>
+												<option value="<?php echo esc_attr( $quiz_id ); ?>" id="<?php echo esc_attr( $quiz_id ); ?>"><?php echo esc_html( $quiz->post_title ); ?></option>
+											<?php endforeach; ?>
+										<?php endif; ?>
+									</select>
+								</div>
+							</div>
+							<div class="qsm-popup-upgrade-warning" style="margin-top: 15px;background:#FFDEDD;border-color:#AD0000;color:#AD0000">
+								<span class="dashicons dashicons-info" style=" font-size: 35px; line-height: 20px; margin-right: 20px; "></span>
+								<span>
+									<?php esc_html_e( 'Do you want to continue and reset all the settings?', 'quiz-master-next' ); ?>
+									<br/><strong> <?php esc_html_e( 'Please note that this action is not reversible.', 'quiz-master-next' ); ?></strong>
+								</span>
+							</div>
+						</main>
+						<footer class="qsm-popup__footer">
+							<button class="qsm-popup__btn" data-micromodal-close="" aria-label="<?php esc_html_e( 'Close this dialog window', 'quiz-master-next' ); ?>"><?php esc_html_e( 'Cancel', 'quiz-master-next' ); ?></button>
+							<button class="button button-primary" type="submit" id="qsm-apply-global-default-btn"><?php esc_html_e( 'Apply', 'quiz-master-next' ); ?></button>
+						</footer>
+					</form>
 				</div>
 			</div>
 		</div>
diff --git a/readme.txt b/readme.txt
index 9421ae273..f2e3551dd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -163,10 +163,26 @@ This is usually a theme conflict. You can [checkout out our common conflict solu
 18. Database
 
 == Changelog ==
+= 9.0.0 (March 26, 2024) =
+* Feature: Implemented a minimum length requirement for text-based question types
+* Feature: Introduced a placeholder option for contact fields
+* Feature: Added option to set default setting to multiple quizzes
+* Feature: Added keyboard navigation functionality to quizzes
+* Feature: Implemented support for rounding off points-based variables
+* Feature: Integrated APIs for submitting and accessing quizzes and results
+* Feature: Added option to duplicate result and email templates
+* Bug: Fixed multiple option contact fields translation issue
+* Bug: Fixed fill in the blanks question type translation issue
+* Bug: Fixed an issue related to quiz submission when using the same quiz twice on the same page
+* Bug: Fixed issue with limit questions categorized incorrectly
+* Enhancement: Enhanced the user interface of option tabs for improved usability
+* Enhancement: Improved the user interface of the upload files question type
+* Enhancement: Improve result and email page UI
+
 = 8.2.3 (March 12, 2024) =
-Bug: Fixed issue with inline result while duplicating quizzes
-Bug: Patched a vulnerability related to the result page
-Enhancement: Improve contact fields UI
+* Bug: Fixed issue with inline result while duplicating quizzes
+* Bug: Patched a vulnerability related to the result page
+* Enhancement: Improve contact fields UI
 
 = 8.2.2 (January 18, 2024) =
 * Feature: Added an option to mark texts as code snippets in the question description

From b664416e3013016570d8499c17b3c19c43928e42 Mon Sep 17 00:00:00 2001
From: Mohammad Zubair Ali <zubair@expresstech.io>
Date: Tue, 26 Mar 2024 16:30:48 +0530
Subject: [PATCH 2/2] update apply global setting ui

---
 php/admin/settings-page.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php/admin/settings-page.php b/php/admin/settings-page.php
index 2f3229b56..badaf3b0d 100644
--- a/php/admin/settings-page.php
+++ b/php/admin/settings-page.php
@@ -812,7 +812,7 @@ public function qsm_global_grading_system() {
 				<?php esc_html_e( 'Both', 'quiz-master-next' ); ?>
 			</label>
 			<label for="qsm-score-roundoff">
-				<input type="checkbox" id="qsm-score-roundoff" name="qsm-quiz-settings[score_roundoff]"  value="1" <?php checked( $qsm_system, 1 ); ?>>
+				<input type="checkbox" id="qsm-score-roundoff" name="qsm-quiz-settings[score_roundoff]"  value="1" <?php checked( $qsm_score_roundoff, 1 ); ?>>
 				<?php esc_html_e( 'Round off all scores and points', 'quiz-master-next' ); ?>
 			</label>
 		</fieldset>