Changeset 3248667

Timestamp:

02/28/2025 06:46:17 PM (12 months ago)

Author:

expresstech

Message:

10.0.1 to trunk

Location:

quiz-master-next/trunk

Files:

• css/admin-dashboard-rtl.css (modified) (1 diff)
• css/admin-dashboard.css (modified) (2 diffs)
• css/qsm-admin.css (modified) (1 diff)
• data/templates.json (modified) (2 diffs)
• js/qsm-admin.js (modified) (2 diffs)
• mlw_quizmaster2.php (modified) (3 diffs)
• php/admin/admin-dashboard.php (modified) (3 diffs)
• php/admin/functions.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)

quiz-master-next/trunk/css/admin-dashboard-rtl.css

@@ -92 +92 @@
 }
 
-.changelog-ul li .bug {
+.changelog-ul li .bug, .changelog-ul li .hotfix {
     background: #fe2525;
 }

quiz-master-next/trunk/css/admin-dashboard.css

@@ -126 +126 @@
 }
 
-.changelog-ul li .bug {
+.changelog-ul li .bug, .changelog-ul li .hotfix {
     background: #FCE7F3;
     color: #92400E;
@@ -136 +136 @@
 }
 
-.changelog-ul li span.bug:before {
+.changelog-ul li span.bug:before, .changelog-ul li span.hotfix:before {
     background: #9D174D;
 }

quiz-master-next/trunk/css/qsm-admin.css

@@ -5097 +5097 @@
     margin: 20px auto;
 }
+.qsm-dashboard-warning-container {
+    background: #fff4d2;
+    border: 1px solid #FFF2EF;
+    padding: 30px 20px;
+    border-radius: 6px;
+    margin: 20px auto;
+}
 .qsm-dashboard-error-content div.error {
     display: none;
 }
-.qsm-dashboard-error-content h2 {
+.qsm-dashboard-error-content h3 {
     font-size: 18px;
     color: #D43838;

quiz-master-next/trunk/data/templates.json

@@ -6 +6 @@
     "template_preview": "competitions-quiz.png",
     "dependency": "1903",
-    "template_content": "<div style=background:linear-gradient(180deg,#3d0072,#4e005f,#6e0068);padding:20px;min-height:100vh><div style=\"max-width:800px;margin:0 auto\"><div style=\"margin:20px 0;font-size:100px;line-height:1;color:#ffc107;text-align:center\">🏆</div><h1 style=color:#ffc107;text-align:center>Excellent<qsmvariabletag>USER_NAME</qsmvariabletag>! You Nailed It!</h1><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:30px><table style=\"max-width:500px;border-collapse:collapse;text-align:center;margin:0 auto\"><tr><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;background:#00c851;color:#fff;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;margin:0 auto\"><qsmvariabletag>AMOUNT_CORRECT</qsmvariabletag></div><span style=margin-top:8px>Right Answer</span></td><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;background:#f35252;color:#fff;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;margin:0 auto\"><qsmvariabletag>AMOUNT_INCORRECT</qsmvariabletag></div><span style=margin-top:8px>Wrong Answer</span></td><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;border:2px dashed #ffc107;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;color:#ffc107;margin:0 auto\"><qsmvariabletag>POINT_SCORE</qsmvariabletag></div><span style=margin-top:8px>Points</span></td></tr></table></div><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:20px><h2 style=color:#ffc107;text-align:center>Leaderboard</h2>[qsm_leaderboard ranks=\"10\" order=\"point_score_asc\" average=\"false\" days=\"0\"]</div><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:20px><h2 style=color:#ffc107;text-align:center>Your Answers</h2><p><qsmvariabletag>QUESTIONS_ANSWERS</qsmvariabletag></div><div style=text-align:center><a href=\"%QUIZ_LINK%\" style=\"text-decoration:none;background:#ffc107;color:#4b015f;border:none;padding:10px 20px;border-radius:25px;font-size:18px;font-weight:700;cursor:pointer;margin:0 auto;width:100%\">⟳ Replay</a></div></div></div>"
+    "template_content": "<div style=background:linear-gradient(180deg,#3d0072,#4e005f,#6e0068);padding:20px;min-height:100vh><div style=\"max-width:800px;margin:0 auto\"><div style=\"margin:20px 0;font-size:100px;line-height:1;color:#ffc107;text-align:center\">🏆</div><h1 style=color:#ffc107;text-align:center>Excellent <qsmvariabletag>USER_NAME</qsmvariabletag>! You Nailed It!</h1><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:30px><table style=\"max-width:500px;border-collapse:collapse;text-align:center;margin:0 auto\"><tr><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;background:#00c851;color:#fff;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;margin:0 auto\"><qsmvariabletag>AMOUNT_CORRECT</qsmvariabletag></div><span style=margin-top:8px>Right Answer</span></td><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;background:#f35252;color:#fff;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;margin:0 auto\"><qsmvariabletag>AMOUNT_INCORRECT</qsmvariabletag></div><span style=margin-top:8px>Wrong Answer</span></td><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;border:2px dashed #ffc107;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;color:#ffc107;margin:0 auto\"><qsmvariabletag>POINT_SCORE</qsmvariabletag></div><span style=margin-top:8px>Points</span></td></tr></table></div><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:20px><h2 style=color:#ffc107;text-align:center>Leaderboard</h2>[qsm_leaderboard ranks=\"10\" order=\"point_score_asc\" average=\"false\" days=\"0\"]</div><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:20px><h2 style=color:#ffc107;text-align:center>Your Answers</h2><p><qsmvariabletag>QUESTIONS_ANSWERS</qsmvariabletag></div><div style=text-align:center><a href=\"%QUIZ_LINK%\" style=\"text-decoration:none;background:#ffc107;color:#4b015f;border:none;padding:10px 20px;border-radius:25px;font-size:18px;font-weight:700;cursor:pointer;margin:0 auto;width:100%\">⟳ Replay</a></div></div></div>"
   },
   {
@@ -53 +53 @@
     "template_preview": "competitions-quiz.png",
     "dependency": "1903",
-    "template_content": "<div style=background:linear-gradient(180deg,#3d0072,#4e005f,#6e0068);padding:20px;min-height:100vh><div style=\"max-width:800px;margin:0 auto\"><div style=\"margin:20px 0;font-size:100px;line-height:1;color:#ffc107;text-align:center\">🏆</div><h1 style=color:#ffc107;text-align:center>Excellent<qsmvariabletag>USER_NAME</qsmvariabletag>! You Nailed It!</h1><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:30px><table style=\"max-width:500px;border-collapse:collapse;text-align:center;margin:0 auto\"><tr><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;background:#00c851;color:#fff;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;margin:0 auto\"><qsmvariabletag>AMOUNT_CORRECT</qsmvariabletag></div><span style=margin-top:8px>Right Answer</span></td><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;background:#f35252;color:#fff;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;margin:0 auto\"><qsmvariabletag>AMOUNT_INCORRECT</qsmvariabletag></div><span style=margin-top:8px>Wrong Answer</span></td><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;border:2px dashed #ffc107;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;color:#ffc107;margin:0 auto\"><qsmvariabletag>POINT_SCORE</qsmvariabletag></div><span style=margin-top:8px>Points</span></td></tr></table></div><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:20px><h2 style=color:#ffc107;text-align:center>Leaderboard</h2>[qsm_leaderboard ranks=\"10\" order=\"point_score_asc\" average=\"false\" days=\"0\"]</div><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:20px><h2 style=color:#ffc107;text-align:center>Your Answers</h2><p><qsmvariabletag>QUESTIONS_ANSWERS</qsmvariabletag></div><div style=text-align:center><a href='<qsmvariabletag>QUIZ_LINK</qsmvariabletag>' style=\"text-decoration:none;background:#ffc107;color:#4b015f;border:none;padding:10px 20px;border-radius:25px;font-size:18px;font-weight:700;cursor:pointer;margin:0 auto;width:100%\">⟳ Replay</a></div></div></div>"
+    "template_content": "<div style=background:linear-gradient(180deg,#3d0072,#4e005f,#6e0068);padding:20px;min-height:100vh><div style=\"max-width:800px;margin:0 auto\"><div style=\"margin:20px 0;font-size:100px;line-height:1;color:#ffc107;text-align:center\">🏆</div><h1 style=color:#ffc107;text-align:center>Excellent <qsmvariabletag>USER_NAME</qsmvariabletag>! You Nailed It!</h1><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:30px><table style=\"max-width:500px;border-collapse:collapse;text-align:center;margin:0 auto\"><tr><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;background:#00c851;color:#fff;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;margin:0 auto\"><qsmvariabletag>AMOUNT_CORRECT</qsmvariabletag></div><span style=margin-top:8px>Right Answer</span></td><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;background:#f35252;color:#fff;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;margin:0 auto\"><qsmvariabletag>AMOUNT_INCORRECT</qsmvariabletag></div><span style=margin-top:8px>Wrong Answer</span></td><td style=padding:10px;vertical-align:middle;text-align:center;width:166px><div style=\"width:60px;height:60px;border:2px dashed #ffc107;border-radius:50px;line-height:60px;font-size:20px;font-weight:700;color:#ffc107;margin:0 auto\"><qsmvariabletag>POINT_SCORE</qsmvariabletag></div><span style=margin-top:8px>Points</span></td></tr></table></div><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:20px><h2 style=color:#ffc107;text-align:center>Leaderboard</h2>[qsm_leaderboard ranks=\"10\" order=\"point_score_asc\" average=\"false\" days=\"0\"]</div><div style=background:#fff;border-radius:12px;padding:20px;margin-bottom:20px><h2 style=color:#ffc107;text-align:center>Your Answers</h2><p><qsmvariabletag>QUESTIONS_ANSWERS</qsmvariabletag></div><div style=text-align:center><a href='<qsmvariabletag>QUIZ_LINK</qsmvariabletag>' style=\"text-decoration:none;background:#ffc107;color:#4b015f;border:none;padding:10px 20px;border-radius:25px;font-size:18px;font-weight:700;cursor:pointer;margin:0 auto;width:100%\">⟳ Replay</a></div></div></div>"
   },
   {

quiz-master-next/trunk/js/qsm-admin.js

@@ -929 +929 @@
                 const selectedTemplateId = templateWrap.find('.qsm-to-replace-page-template').val();
                 const uniqueId = button.data('id');
-                const editor = tinymce.get('results-page-' + (uniqueId));
                 const templateType = button.parents('.qsm-insert-page-template-anchor').data('template-type');
+                if (templateType == 'result') {
+                    var editor = tinymce.get('results-page-' + (uniqueId));
+                } else if (templateType == 'email') {
+                    var editor = tinymce.get('email-template-' + (uniqueId));
+                }
+                
                 const templateContent = editor.getContent().trim();
                 const isReplace = jQuery('input[name="qsm-template-action"]:checked').val() === 'replace';
@@ -1008 +1013 @@
             jQuery(document).on('click', '.qsm-insert-page-template-anchor', function (e) {
                 let templateWrap = jQuery(this).find('.qsm-insert-template-wrap');
+                let radioButtons = jQuery(this).find('input[type="radio"][name="qsm-template-action"]');
+                if (!radioButtons.is(':checked')) { 
+                    radioButtons.filter('[value="new"]').prop('checked', true).trigger('change');
+                }
                 jQuery('.qsm-settings-box-details, .qsm-more-settings-box-details').hide();
                 if (!templateWrap.is(':visible')) {

quiz-master-next/trunk/mlw_quizmaster2.php

@@ -3 +3 @@
  * Plugin Name: Quiz And Survey Master
  * Description: Easily and quickly add quizzes and surveys to your website.
- * Version: 10.0.0
+ * Version: 10.0.1
  * Author: ExpressTech
  * Author URI: https://quizandsurveymaster.com/
@@ -44 +44 @@
      * @since 4.0.0
      */
-    public $version = '10.0.0';
+    public $version = '10.0.1';
 
     /**
@@ -1260 +1260 @@
             <?php
         }
-        qsm_check_plugins_compatibility();
     }
 }

quiz-master-next/trunk/php/admin/admin-dashboard.php

@@ -50 +50 @@
     if ( $hidden_box && is_array( $hidden_box ) ) {
         echo in_array( $widget_id, $hidden_box, true ) ? ' hide-if-js' : '';
+    }
+}
+
+function qsm_check_plugins_compatibility() {
+    global $mlwQuizMasterNext;
+
+    if ( class_exists('QSM_Installer') ) {
+        $plugin_path = WP_PLUGIN_DIR . '/qsm-installer/qsm-installer.php';
+        $plugin_data = get_plugin_data( $plugin_path );
+
+        // Check if the plugin version is below 2.0.0
+        if ( isset( $plugin_data['Version'] ) && version_compare( $plugin_data['Version'], '2.0.0', '<' ) ) {
+            $account_url = esc_url( qsm_get_utm_link( 'https://quizandsurveymaster.com/account', 'dashboard', 'useful_links', 'qsm_installer_update' ) );
+            ?>
+            <div class="qsm-dashboard-help-center qsm-dashboard-warning-container">
+                <div class="qsm-dashboard-error-content">
+                    <h3><?php esc_html_e('Update Available', 'quiz-master-next'); ?></h3>
+                    <p><?php esc_html_e('We recommend downloading the latest version of the QSM Installer for a seamless quiz and survey creation experience.', 'quiz-master-next'); ?></p>
+                    <a href="<?php echo esc_url($account_url); ?>" class="qsm-dashboard-error-btn" target="_blank">
+                        <?php esc_html_e('Get Latest QSM Installer', 'quiz-master-next'); ?>
+                    </a>
+                </div>
+            </div>
+        <?php
+        }
     }
 }
@@ -61 +86 @@
     if ( $wp_filesystem->exists( $readme_file ) ) {
         $file_content = $wp_filesystem->get_contents( $readme_file );
+
         if ( $file_content ) {
-            $parts           = explode( '== Changelog ==', $file_content );
-            $last_change_log = mlw_qmn_get_string_between( $parts[1], ' =', '= ' );
-            $change_log      = array_filter( explode( '* ', trim( $last_change_log ) ) );
+            $parts = explode( '== Changelog ==', $file_content, 2 );
+            if ( isset( $parts[1] ) ) {
+                preg_match_all('/\* (.+)/', $parts[1], $matches);
+                if ( ! empty($matches[1]) ) {
+                    $change_log = array_slice($matches[1], 0, 5);
+                }
+            }
         }
     }
@@ -268 +298 @@
                 $popular_addons = isset($qsm_admin_dd['popular_products']) ? $qsm_admin_dd['popular_products'] : [];
                 $themes = isset($qsm_admin_dd['themes']) ? $qsm_admin_dd['themes'] : [];
+                qsm_check_plugins_compatibility();
                 qsm_dashboard_display_need_help_section();
                 qsm_dashboard_display_popular_addon_section($popular_addons);

quiz-master-next/trunk/php/admin/functions.php

@@ -1521 +1521 @@
             "description"  => __( 'Enhance your quizzes with seamless integrations using the QSM Webhooks Addon.', 'quiz-master-next' ),
             "chart_image"  => plugins_url( '', dirname( __FILE__ ) ) . '/images/proctor_quiz_chart.png',
-            "warning"      => __( 'Missing Feature - webhook Add-on required', 'quiz-master-next' ),
+            "warning"      => __( 'Missing Feature - webhook Add-On required', 'quiz-master-next' ),
             "information"  => __( 'QSM Addon Bundle is the best way to get all our add-ons at a discount. Upgrade to save 95% today. OR you can buy Webhooks Addon separately.', 'quiz-master-next' ),
             "buy_btn_text" => __( 'Buy Webhooks Addon', 'quiz-master-next' ),
@@ -1806 +1806 @@
         return;
     }
-    ?>
+    $active_themes   = $mlwQuizMasterNext->theme_settings->get_active_themes();
+
+    if ( empty($active_themes) ) {
+        return;
+    }
+    $pro_themes = array( 'Fortune', 'Sigma', 'Pixel', 'Sapience', 'Breeze', 'Fragrance', 'Pool', 'Ivory' );
+
+    $has_pro_theme = false;
+    foreach ( $active_themes as $theme ) {
+        if ( in_array($theme['theme_name'], $pro_themes, true) ) {
+            $has_pro_theme = true;
+            break;
+        }
+    }
+
+    if ( ! $has_pro_theme ) {
+        return;
+    }
+    ?>
     <a href="?page=qmn_global_settings&tab=qsm-theme-defaults" class="nav-tab <?php echo ! empty( $_GET['tab'] ) && 'qsm-theme-defaults' === $_GET['tab'] ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Theme Defaults', 'quiz-master-next' ); ?></a>
     <?php
@@ -1960 +1978 @@
     <div id="qsm-dashboard-error-container">
         <div class="qsm-dashboard-error-content">
-            <h2><?php esc_html_e('Unable To Load Required Data', 'quiz-master-next'); ?></h2>
+            <h3><?php esc_html_e('Unable To Load Required Data', 'quiz-master-next'); ?></h3>
             <p><?php esc_html_e('We couldn\'t load the required data, contact our support team for assistance, or you can still create a quiz.', 'quiz-master-next'); ?></p>
             <ul>
@@ -1973 +1991 @@
     <?php
 }
-
-function qsm_check_plugins_compatibility() {
-    global $mlwQuizMasterNext;
-
-    if ( class_exists('QSM_Installer') ) {
-        $plugin_path = WP_PLUGIN_DIR . '/qsm-installer/qsm-installer.php';
-        $plugin_data = get_plugin_data( $plugin_path );
-
-        // Check if the plugin version is below 2.0.0
-        if ( isset( $plugin_data['Version'] ) && version_compare( $plugin_data['Version'], '2.0.0', '<' ) ) {
-            ?>
-            <div class="notice notice-error">
-                <p>
-                    <?php
-                    $account_url = esc_url( qsm_get_utm_link( 'https://quizandsurveymaster.com/account', 'dashboard', 'useful_links', 'qsm_installer_update' ) );
-
-                    echo wp_kses(
-                        sprintf(
-                            /* translators: %s is the URL to the QSM account page */
-                            __( 'Please download the latest version of the QSM - Installer from <a href="%s" target="_blank" rel="noopener noreferrer">your account</a>.', 'quiz-master-next' ),
-                            $account_url
-                        ),
-                        array(
-                            'a' => array(
-                                'href'   => array(),
-                                'target' => array(),
-                                'rel'    => array(),
-                            ),
-                        )
-                    );
-                    ?>
-                </p>
-            </div>
-            <?php
-        }
-    }
-}

quiz-master-next/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.7
 Requires PHP: 5.4
-Stable tag: 10.0.0
+Stable tag: 10.0.1
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -222 +222 @@
 
 == Changelog ==
+= 10.0.1 ( March 01, 2025 ) =
+* Hotfix: Resolved JS warning while saving email template
+
 = 10.0.0 ( Fabuary 28, 2025 ) =
 * Feature: Added options to import and create email and result templates