From 9dec8861c409161baafe33b2048d757f53bdbc0b Mon Sep 17 00:00:00 2001
From: HerrVigg <herrvigg@gmail.com>
Date: Mon, 30 May 2022 00:42:12 +0200
Subject: [PATCH] Generalize double checkboxes in QTX options

Add a generic feature to handle double checkboxes in options e.g. for confirmation.
The main checkbox must have:
- HTML class `qtranxs_double_check`
- attribute `data-double-check` giving CSS selector for associated checkbox(es)

The associated checkboxes should be disabled by default.

Rename `qtranslate_reset` IDs for disambiguation (x3).
---
 admin/js/options.js                |  7 +++++++
 admin/qtx_admin_options_update.php |  6 +++---
 admin/qtx_import_export.php        | 25 +++++++++++++++++--------
 dist/options.js                    |  2 +-
 qtranslate.php                     |  2 +-
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/admin/js/options.js b/admin/js/options.js
index 0a9305b4..39a896f8 100644
--- a/admin/js/options.js
+++ b/admin/js/options.js
@@ -104,4 +104,11 @@ $(function () {
             }
         });
     })
+
+    // Checkboxes with double-check has associated checkbox(es) depending on it.
+    $('.qtranxs_double_check').on('click', function () {
+        const check = $($(this).attr('data-double-check'));  // There may be more than one checkbox (CSS selector).
+        check.prop('disabled', !$(this).prop('checked'));
+        check.prop('checked', false);
+    });
 });
diff --git a/admin/qtx_admin_options_update.php b/admin/qtx_admin_options_update.php
index ceb1024a..6a2035c0 100644
--- a/admin/qtx_admin_options_update.php
+++ b/admin/qtx_admin_options_update.php
@@ -42,7 +42,7 @@ function qtranxf_edit_config() {
     $original_lang = &$q_config['posted']['original_lang'];
 
     // check for action
-    if ( isset( $_POST['qtranslate_reset'] ) && isset( $_POST['qtranslate_reset2'] ) ) {
+    if ( isset( $_POST['qtranslate_reset_all'] ) && isset( $_POST['qtranslate_reset_confirm'] ) ) {
         $messages[] = __( 'qTranslate has been reset.', 'qtranslate' );
     } elseif ( isset( $_POST['default_language'] ) ) {
         // TODO: remove temporary hack - restore QTS options for master dev before migration.
@@ -343,7 +343,7 @@ function qtranxf_reset_config() {
         qtranxf_add_message( __( 'Admin notices have been reset. You will see all applicable notices on admin pages and may dismiss them again.', 'qtranslate' ) );
     }
 
-    if ( ! isset( $_POST['qtranslate_reset'] ) || ! isset( $_POST['qtranslate_reset2'] ) ) {
+    if ( ! isset( $_POST['qtranslate_reset_all'] ) || ! isset( $_POST['qtranslate_reset_confirm'] ) ) {
         return;
     }
 
@@ -381,7 +381,7 @@ function qtranxf_reset_config() {
     delete_option( 'qtranslate_versions' );
     delete_option( 'qtranslate_disable_header_css' );
 
-    if ( isset( $_POST['qtranslate_reset3'] ) ) {
+    if ( isset( $_POST['qtranslate_reset_terms'] ) ) {
         delete_option( 'qtranslate_term_name' );
     }
 
diff --git a/admin/qtx_import_export.php b/admin/qtx_import_export.php
index 138fb9d9..f662c326 100644
--- a/admin/qtx_import_export.php
+++ b/admin/qtx_import_export.php
@@ -236,8 +236,8 @@ function qtranxf_admin_section_import_export( $request_uri ) {
                     <label for="qtranslate_import_slugs_migrate">
                         <input type="checkbox" name="qtranslate_import_slugs_migrate"
                                id="qtranslate_import_slugs_migrate"
-                               value="1"
-                               onclick="let c=jQuery('#qtranslate_import_slugs_confirm'); c.prop('disabled', !jQuery(this).prop('checked')); c.prop('checked', false);"/>
+                               class="qtranxs_double_check" data-double-check="#qtranslate_import_slugs_confirm"
+                               value="1"/>
                         <?php _e( 'Migrate slugs options, post and term meta from legacy QTS plugin to qTranslate.', 'qtranslate' ); ?>
                     </label>
                     <br/>
@@ -253,20 +253,29 @@ function qtranxf_admin_section_import_export( $request_uri ) {
         <tr>
             <th scope="row"><?php _e( 'Reset qTranslate', 'qtranslate' ) ?></th>
             <td>
-                <label for="qtranslate_reset"><input type="checkbox" name="qtranslate_reset" id="qtranslate_reset"
-                                                     value="1"/> <?php _e( 'Check this box and click Save Changes to reset all qTranslate settings.', 'qtranslate' ) ?>
+                <label for="qtranslate_reset_all">
+                    <input type="checkbox" name="qtranslate_reset_all" id="qtranslate_reset_all"
+                           class="qtranxs_double_check"
+                           data-double-check="#qtranslate_reset_confirm,#qtranslate_reset_terms"
+                           value="1"/>
+                    <?php _e( 'Check this box and click Save Changes to reset all qTranslate settings.', 'qtranslate' ) ?>
                 </label>
                 <br/>
-                <label for="qtranslate_reset2"><input type="checkbox" name="qtranslate_reset2" id="qtranslate_reset2"
-                                                      value="1"/> <?php _e( 'Yes, I really want to reset qTranslate.', 'qtranslate' ) ?>
+                <label for="qtranslate_reset_confirm">
+                    <input type="checkbox" name="qtranslate_reset_confirm" id="qtranslate_reset_confirm"
+                           value="1" <?php disabled( true ) ?>/>
+                    <?php _e( 'Yes, I really want to reset qTranslate.', 'qtranslate' ) ?>
                 </label>
                 <br/>
-                <label for="qtranslate_reset3"><input type="checkbox" name="qtranslate_reset3" id="qtranslate_reset3"
-                                                      value="1"/> <?php _e( 'Also delete Translations for Categories/Tags/Link Categories.', 'qtranslate' ) ?>
+                <label for="qtranslate_reset_terms">
+                    <input type="checkbox" name="qtranslate_reset_terms" id="qtranslate_reset_terms"
+                           value="1" <?php disabled( true ) ?>/>
+                    <?php _e( 'Also delete Translations for Categories/Tags/Link Categories.', 'qtranslate' ) ?>
                 </label>
                 <br/>
                 <small><?php _e( 'If something isn\'t working correctly, you can always try to reset all qTranslate settings. A Reset won\'t delete any posts but will remove all settings (including all languages added).', 'qtranslate' ) ?></small>
                 <br/>
+                <br/>
                 <label for="qtranslate_reset_admin_notices"><input type="checkbox" name="qtranslate_reset_admin_notices"
                                                                    id="qtranslate_reset_admin_notices"
                                                                    value="1"/> <?php _e( 'Reset admin notices.', 'qtranslate' ) ?>
diff --git a/dist/options.js b/dist/options.js
index 5ac8f358..6dad2a3c 100644
--- a/dist/options.js
+++ b/dist/options.js
@@ -1 +1 @@
-(()=>{"use strict";var n=jQuery,a="qtranslate-xt-admin-section",t=function(t){if(!t)return!1;var r=n('.nav-tab-wrapper a[href="'+t+'"]');if(!r.length)return!1;r.parent().children().removeClass("nav-tab-active"),r.addClass("nav-tab-active");var e=n("#qtranxs-configuration-form"),i=t.replace("#","#tab-"),o=n(".tabs-content");o.children().addClass("hidden"),o.find("div"+i).removeClass("hidden");var s=e.attr("action").replace(/(#.*|$)/,t);e.attr("action",s);try{sessionStorage.setItem(a,t)}catch(n){console.log('Failed to store "'+a+'" with sessionStorage',n)}return!0},r=function(n){var r=window.location.hash;if(!t(r)){var e=sessionStorage.getItem(a);t(e)||t(n)}},e=function(a){var t=n("#preview_flag");t.css("display","inline"),t.attr("src",t.attr("data-flag-path")+a)};n((function(){n(window).bind("hashchange",(function(){r()})),r("#general");var a=n("#language_flag");a.on("change",(function(){e(this.value)})),e(a.val()),n("#qtranxs_debug_query").on("click",(function(){for(var a=document.cookie.split(";"),t={cookies:[],navigator:navigator.userAgent},r=0;r<a.length;r++){var e=a[r].trim();0===e.indexOf("qtrans")&&t.cookies.push(e)}n("#qtranxs_debug_info").show(),n("#qtranxs_debug_info_browser").val(JSON.stringify(t,null,2)),n("#qtranxs_debug_info_versions").val("..."),n("#qtranxs_debug_info_configuration").val("..."),n.ajax({url:ajaxurl,dataType:"json",data:{action:"admin_debug_info"},success:function(a){console.log("debug-info",a),n("#qtranxs_debug_info_versions").val(JSON.stringify(a.versions,null,2)),n("#qtranxs_debug_info_configuration").val(JSON.stringify(a.configuration,null,2))},error:function(a){console.error("debug-info",a),n("#qtranxs_debug_info_versions").val("An error occurred: status="+a.status+" ("+a.statusText+")")}})}))}))})();
\ No newline at end of file
+(()=>{"use strict";var n=jQuery,a="qtranslate-xt-admin-section",t=function(t){if(!t)return!1;var e=n('.nav-tab-wrapper a[href="'+t+'"]');if(!e.length)return!1;e.parent().children().removeClass("nav-tab-active"),e.addClass("nav-tab-active");var r=n("#qtranxs-configuration-form"),o=t.replace("#","#tab-"),i=n(".tabs-content");i.children().addClass("hidden"),i.find("div"+o).removeClass("hidden");var s=r.attr("action").replace(/(#.*|$)/,t);r.attr("action",s);try{sessionStorage.setItem(a,t)}catch(n){console.log('Failed to store "'+a+'" with sessionStorage',n)}return!0},e=function(n){var e=window.location.hash;if(!t(e)){var r=sessionStorage.getItem(a);t(r)||t(n)}},r=function(a){var t=n("#preview_flag");t.css("display","inline"),t.attr("src",t.attr("data-flag-path")+a)};n((function(){n(window).bind("hashchange",(function(){e()})),e("#general");var a=n("#language_flag");a.on("change",(function(){r(this.value)})),r(a.val()),n("#qtranxs_debug_query").on("click",(function(){for(var a=document.cookie.split(";"),t={cookies:[],navigator:navigator.userAgent},e=0;e<a.length;e++){var r=a[e].trim();0===r.indexOf("qtrans")&&t.cookies.push(r)}n("#qtranxs_debug_info").show(),n("#qtranxs_debug_info_browser").val(JSON.stringify(t,null,2)),n("#qtranxs_debug_info_versions").val("..."),n("#qtranxs_debug_info_configuration").val("..."),n.ajax({url:ajaxurl,dataType:"json",data:{action:"admin_debug_info"},success:function(a){console.log("debug-info",a),n("#qtranxs_debug_info_versions").val(JSON.stringify(a.versions,null,2)),n("#qtranxs_debug_info_configuration").val(JSON.stringify(a.configuration,null,2))},error:function(a){console.error("debug-info",a),n("#qtranxs_debug_info_versions").val("An error occurred: status="+a.status+" ("+a.statusText+")")}})})),n(".qtranxs_double_check").on("click",(function(){var a=n(n(this).attr("data-double-check"));a.prop("disabled",!n(this).prop("checked")),a.prop("checked",!1)}))}))})();
\ No newline at end of file
diff --git a/qtranslate.php b/qtranslate.php
index 8509a595..ef6dbbc3 100644
--- a/qtranslate.php
+++ b/qtranslate.php
@@ -54,7 +54,7 @@
  * Designed as interface for other plugin integration. The documentation is available at
  * https://github.com/qtranslate/qtranslate-xt/wiki/Integration-Guide/
  */
-define( 'QTX_VERSION', '3.11.4' );
+define( 'QTX_VERSION', '3.12.0.dev.0' );
 
 if ( ! defined( 'QTRANSLATE_FILE' ) ) {
     define( 'QTRANSLATE_FILE', __FILE__ );